diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-04-21 15:16:40 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:56:17 -0700 |
| commit | 5047a0f6d0b6c1c44d0f692531396f1c5b541c74 (patch) | |
| tree | ffcd806160112f222d96be7ccae0c45fe460a333 /arch/arm/mach-tegra/board-cardhu.c | |
| parent | 23e69c4ccebadc2b1152a5b3973780cd797c939a (diff) | |
arm: tegra: Fix suspend/resume issue for spdif.
bug 793875
bug 818490
Merge spdif soc code from dev_hc.
Add clock and power mode calls to spdif
Fix the system suspend/resume issue caused by audio modules.
Original-Change-Id: Ie6d9c1e52596fa744dff893fd7340c1fa2f0f058
Reviewed-on: http://git-master/r/28520
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Tested-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: I367a048727b5fbe1a8db70a140b6ed1d752cd3a5
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 135b7fe1827c..5264f6b82fe0 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -308,7 +308,7 @@ static struct tegra_audio_platform_data tegra_audio_pdata[] = { .i2s_master = true, .dma_on = true, /* use dma by default */ .i2s_master_clk = 44100, - .i2s_clk_rate = 11289600, + .dev_clk_rate = 11289600, .dap_clk = "extern1", .mode = AUDIO_FRAME_FORMAT_I2S, .fifo_fmt = AUDIO_FIFO_PACK_16, @@ -320,9 +320,9 @@ static struct tegra_audio_platform_data tegra_audio_pdata[] = { static struct tegra_audio_platform_data tegra_spdif_pdata = { .dma_on = true, /* use dma by default */ - .i2s_clk_rate = 5644800, + .dev_clk_rate = 5644800, .mode = SPDIF_BIT_MODE_MODE16BIT, - .fifo_fmt = 0, + .fifo_fmt = AUDIO_FIFO_PACK_16, }; struct tegra_wired_jack_conf audio_wr_jack_conf = { |