summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-enterprise.c
diff options
context:
space:
mode:
authorScottPeterson <speterson@nvidia.com>2012-01-17 16:37:09 -0800
committerVarun Colbert <vcolbert@nvidia.com>2012-01-30 13:20:11 -0800
commitc9a56773548db233cef3220505a9ce638720c941 (patch)
treee392d98b12b32810fed73c9cd88e5d9fbf7f484a /arch/arm/mach-tegra/board-enterprise.c
parent38870b9bdf7784df83a8a029533b45134ba02435 (diff)
arm: tegra: Clock audio from clk_m
Clock audio from clkm as a pre-condition of disabling pllp_out1 and plla when I2S is in slave mode. Change-Id: I1706c2989cf7ad9045526ceba3326777b702868a Reviewed-on: http://git-master/r/76391 Signed-off-by: ScottPeterson <speterson@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I243508cc553ebf22bb5594a9461019abfec24b65 Reviewed-on: http://git-master/r/77753 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise.c')
-rw-r--r--arch/arm/mach-tegra/board-enterprise.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c
index 5e90ba07ad5a..8c194b5bdd51 100644
--- a/arch/arm/mach-tegra/board-enterprise.c
+++ b/arch/arm/mach-tegra/board-enterprise.c
@@ -177,17 +177,15 @@ static __initdata struct tegra_clk_init_table enterprise_clk_init_table[] = {
{ "hda2codec_2x","pll_p", 48000000, false},
{ "pwm", "clk_32k", 32768, false},
{ "blink", "clk_32k", 32768, true},
- { "pll_a", NULL, 564480000, false},
- { "pll_a_out0", NULL, 11289600, false},
{ "i2s0", "pll_a_out0", 0, false},
{ "i2s1", "pll_a_out0", 0, false},
{ "i2s2", "pll_a_out0", 0, false},
{ "i2s3", "pll_a_out0", 0, false},
{ "spdif_out", "pll_a_out0", 0, false},
- { "d_audio", "pll_a_out0", 0, false},
- { "dam0", "pll_a_out0", 0, false},
- { "dam1", "pll_a_out0", 0, false},
- { "dam2", "pll_a_out0", 0, false},
+ { "d_audio", "clk_m", 12000000, false},
+ { "dam0", "clk_m", 12000000, false},
+ { "dam1", "clk_m", 12000000, false},
+ { "dam2", "clk_m", 12000000, false},
{ "audio0", "i2s0_sync", 0, false},
{ "audio1", "i2s1_sync", 0, false},
{ "audio2", "i2s2_sync", 0, false},