diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-10-11 14:32:59 -0700 |
|---|---|---|
| committer | Cheryl Jones <chjones@nvidia.com> | 2011-10-12 15:04:46 -0700 |
| commit | f641723b08ba660834a69f6adffe41c9f038f51d (patch) | |
| tree | 8a13eb8e2c325d55e21d90d42f6986d8bfb973a2 | |
| parent | 56cc0257a42b966cf1de3221c7fc3098557a9808 (diff) | |
arm: tegra: Add ti codec support to board file.
Adding i2c info needed for ti codec.
Setting dap1 to use with voice call till ti codec driver add secondary
interface support.
bug 816608
Change-Id: I391c3eb58052f8852e25c5aafe92d294316f440d
Reviewed-on: http://git-master/r/57397
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Tested-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 7ceaf477ad91..2867e4bc2f75 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -470,6 +470,7 @@ static struct tegra_das_platform_data tegra_das_pdata = { [3] = {tegra_das_port_dap1, tegra_das_port_i2s1, false}, }, }, +#ifdef CONFIG_SND_SOC_WM8753 [2] = { .con_id = tegra_das_port_con_id_voicecall_no_bt, .num_entries = 4, @@ -480,6 +481,16 @@ static struct tegra_das_platform_data tegra_das_pdata = { [3] = {tegra_das_port_dap1, tegra_das_port_i2s1, false}, }, }, +#else + [2] = { + .con_id = tegra_das_port_con_id_voicecall_no_bt, + .num_entries = 2, + .con_line = { + [0] = {tegra_das_port_dap1, tegra_das_port_dap3, true}, + [1] = {tegra_das_port_dap3, tegra_das_port_dap1, false}, + }, + }, +#endif } }; @@ -725,11 +736,19 @@ static void __init whistler_power_off_init(void) pm_power_off = whistler_power_off; } +#ifdef CONFIG_SND_SOC_WM8753 static const struct i2c_board_info whistler_codec_info[] = { { I2C_BOARD_INFO("wm8753", 0x1a), }, }; +#else +static const struct i2c_board_info whistler_codec_info[] = { + { + I2C_BOARD_INFO("tlv320aic3262", 0x18), + }, +}; +#endif static void whistler_codec_init(void) { |