diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-03-03 16:37:42 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:45:26 -0800 |
| commit | 4577878dc23ac25dcbd6a50c405951397b48999b (patch) | |
| tree | 44991e4fd7865df99099e21f69bb7dc3ae42ab7b /arch/arm/mach-tegra/board-aruba.c | |
| parent | ca907c6d2f7c16d7150576a233342e7d872eafe4 (diff) | |
arm: tegra: Fix aruba build break
Add missing define and structure to cardhu configuration.
Original-Change-Id: I9be181600cc533fb4edabd07e66ee7efb6c7f0ee
Reviewed-on: http://git-master/r/21574
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Hoang Pham <hopham@nvidia.com>
Tested-by: Hoang Pham <hopham@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Original-Change-Id: I55428a5bf273901b4445560857e8ba489a0b031f
Rebase-Id: Rfdc5f0bc33f142af098522a307a764dc88828811
Diffstat (limited to 'arch/arm/mach-tegra/board-aruba.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c index 4a1cb3683976..351292c9a8b8 100644 --- a/arch/arm/mach-tegra/board-aruba.c +++ b/arch/arm/mach-tegra/board-aruba.c @@ -159,7 +159,7 @@ static __initdata struct tegra_clk_init_table aruba_clk_init_table[] = { { "pll_a_out0", NULL, 11289600, true}, { "i2s1", "pll_a_out0", 11289600, true}, { "i2s2", "pll_a_out0", 11289600, true}, - { "audio", "pll_a_out0", 11289600, true}, + { "d_audio", "pll_a_out0", 11289600, false}, { "audio_2x", "audio", 22579200, true}, { NULL, NULL, 0, 0}, }; @@ -220,12 +220,20 @@ static struct tegra_audio_platform_data tegra_audio_pdata[] = { [0] = { .dma_on = true, /* use dma by default */ .i2s_clk_rate = 240000000, - .dap_clk = "clk_dev1", + .dap_clk = "extern1", .audio_sync_clk = "audio_2x", .mode = I2S_BIT_FORMAT_I2S, .fifo_fmt = I2S_FIFO_16_LSB, .bit_size = I2S_BIT_SIZE_16, - }, + .i2s_bus_width = 32, + .dsp_bus_width = 16, + } +}; + +struct tegra_wired_jack_conf audio_wr_jack_conf = { + .hp_det_n = TEGRA_GPIO_PW2, + .en_mic_ext = TEGRA_GPIO_PX1, + .en_mic_int = TEGRA_GPIO_PX0, }; static void aruba_i2c_init(void) |