diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-05 12:46:57 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-05 12:46:57 +0530 |
| commit | 292a8fbb52fb5f2841092c492c1a9176ab8e4d4a (patch) | |
| tree | 3247300064e95a4022020a2c1fc92e8d22b0e39c /arch/arm/mach-tegra/board-p1852.c | |
| parent | 5fc8ea3995bfdddd064d6d14b883ff6ee9fd55b9 (diff) | |
| parent | 6af42a88c75a0978f8c2c51d09ad2e2e49b6fd67 (diff) | |
Merge branch 'android-tegra-nv-3.4' into android-t114-3.4
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
Change-Id: I9ce33061dcbf7ce41a2fe04da4e7b754b2a659c8
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-p1852.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-p1852.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/board-p1852.c b/arch/arm/mach-tegra/board-p1852.c index 0f89a86e4d41..b7d2bf41b4e5 100644 --- a/arch/arm/mach-tegra/board-p1852.c +++ b/arch/arm/mach-tegra/board-p1852.c @@ -69,7 +69,7 @@ static __initdata struct tegra_clk_init_table p1852_clk_init_table[] = { /* audio cif clock should be faster than i2s */ { "pll_a_out0", NULL, 24576000, false}, { "d_audio", "pll_a_out0", 24576000, false}, - { "nor", "pll_p", 86500000, true}, + { "nor", "pll_p", 102000000, true}, { "uarta", "pll_p", 480000000, true}, { "uartd", "pll_p", 480000000, true}, { "uarte", "pll_p", 480000000, true}, @@ -86,11 +86,6 @@ static __initdata struct tegra_clk_init_table p1852_clk_init_table[] = { { "i2s2", "pll_a_out0", 24576000, false}, { "i2s3", "pll_a_out0", 24576000, false}, { "i2s4", "pll_a_out0", 24576000, false}, - { "audio0", "i2s0_sync", 12288000, false}, - { "audio1", "i2s1_sync", 12288000, false}, - { "audio2", "i2s2_sync", 12288000, false}, - { "audio3", "i2s3_sync", 12288000, false}, - { "audio4", "i2s4_sync", 12288000, false}, { "apbif", "clk_m", 12000000, false}, { "dam0", "clk_m", 12000000, true}, { "dam1", "clk_m", 12000000, true}, |