diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-04-08 17:40:39 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:55:47 -0700 |
| commit | 98a17bf9060d5e92ba7564f30110b2d43c25e5e8 (patch) | |
| tree | a17f17a6f2b1bbc354e61f7d09bb55c3045bd769 /arch/arm/mach-tegra/board-aruba.c | |
| parent | ea09114b2e6e34107af2218bd122dd22db5a72c2 (diff) | |
arm: tegra: correct the i2s clocking
Rearrange the i2s clock code so that it will be handled properly
using the audio_manager code.
Mclk code is moved to audio_manager from soc.
bug 804696
Original-Change-Id: Icf9e823154cf3b5a63426944c4864a413df82213
Reviewed-on: http://git-master/r/27255
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>
Change-Id: I8acd9c5d5389b3d4ca574bd62a392c56fdfa35b7
Diffstat (limited to 'arch/arm/mach-tegra/board-aruba.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c index d6b006dd7e1a..c2e0a3bea7d4 100644 --- a/arch/arm/mach-tegra/board-aruba.c +++ b/arch/arm/mach-tegra/board-aruba.c @@ -256,13 +256,14 @@ static struct tegra_i2c_platform_data aruba_i2c5_platform_data = { static struct tegra_audio_platform_data tegra_audio_pdata[] = { [0] = { + .i2s_master = true, .dma_on = true, /* use dma by default */ - .i2s_clk_rate = 240000000, + .i2s_master_clk = 44100, + .i2s_clk_rate = 11289600, .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, + .mode = AUDIO_FRAME_FORMAT_I2S, + .fifo_fmt = AUDIO_FIFO_PACK_16, + .bit_size = AUDIO_BIT_SIZE_16, .i2s_bus_width = 32, .dsp_bus_width = 16, } |