diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /sound/soc/tegra/tegra_asoc_utils.h | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'sound/soc/tegra/tegra_asoc_utils.h')
| -rw-r--r-- | sound/soc/tegra/tegra_asoc_utils.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_asoc_utils.h b/sound/soc/tegra/tegra_asoc_utils.h index 0423f02b76cc..cd137967fcb0 100644 --- a/sound/soc/tegra/tegra_asoc_utils.h +++ b/sound/soc/tegra/tegra_asoc_utils.h @@ -2,7 +2,7 @@ * tegra_asoc_utils.h - Definitions for Tegra DAS driver * * Author: Stephen Warren <swarren@nvidia.com> - * Copyright (C) 2010 - NVIDIA, Inc. + * Copyright (c) 2010-12, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +24,6 @@ #define __TEGRA_ASOC_UTILS_H_ -#define TEGRA30_I2S_MASTER_PLAYBACK 1 #define TEGRA_ALSA_MAX_DEVICES 6 #define TEGRA_DMA_MAX_CHANNELS 32 @@ -44,14 +43,17 @@ struct tegra_asoc_utils_data { int set_mclk; int lock_count; int avp_device_id; + unsigned int avp_dma_addr; }; int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate, - int mclk); + int mclk); void tegra_asoc_utils_lock_clk_rate(struct tegra_asoc_utils_data *data, - int lock); + int lock); int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, - struct device *dev, struct snd_soc_card *card); + struct device *dev, struct snd_soc_card *card); +int tegra_asoc_utils_set_parent(struct tegra_asoc_utils_data *data, + int is_i2s_master); void tegra_asoc_utils_fini(struct tegra_asoc_utils_data *data); int tegra_asoc_utils_clk_enable(struct tegra_asoc_utils_data *data); int tegra_asoc_utils_clk_disable(struct tegra_asoc_utils_data *data); |