Merge tag 'tegra-for-3.8-fixes-for-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

ARM: tegra: fixes for 3.8

This branch contains a few miscellaneous fixes that have shown up in the
last few weeks.

By Sivaram Nair (2) and Hiroshi Doyu (1)
via Stephen Warren
* tag 'tegra-for-3.8-fixes-for-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  amba: tegra-ahb: Fix warning w/o PM_SLEEP
  ARM: tegra: fix comment in dsib clk set_parent
  ARM: tegra: select correct parent clk for pll_p

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-tegra/common.c
index 0816562725f64c61b72744ecd1b88af350828d01,988549a77b69610a8d41a53d1610244219f01f11..d54cfc54b9fe2cc959ced2b12be5a0b7258b39ad
--- 1/arch/arm/mach-tegra/common.c
--- 2/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -104,13 -102,8 +104,13 @@@ static __initdata struct tegra_clk_init
  static __initdata struct tegra_clk_init_table tegra30_clk_init_table[] = {
        /* name         parent          rate            enabled */
        { "clk_m",      NULL,           0,              true },
-       { "pll_p",      "clk_m",        408000000,      true },
+       { "pll_p",      "pll_ref",      408000000,      true },
        { "pll_p_out1", "pll_p",        9600000,        true },
 +      { "pll_p_out4", "pll_p",        102000000,      true },
 +      { "sclk",       "pll_p_out4",   102000000,      true },
 +      { "hclk",       "sclk",         102000000,      true },
 +      { "pclk",       "hclk",         51000000,       true },
 +      { "csite",      NULL,           0,              true },
        { NULL,         NULL,           0,              0},
  };
  #endif

diff --cc arch/arm/mach-tegra/tegra30_clocks.c
Simple merge

diff --cc drivers/amba/tegra-ahb.c
Simple merge