Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f600f40 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.8-fixes-for-rc1' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 6a2461a4 f1101749

arch/arm/mach-tegra/common.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static __initdata struct tegra_clk_init_table tegra20_clk_init_table[] = { 
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 },

arch/arm/mach-tegra/tegra30_clocks.c

+1 −3
Original line number Diff line number Diff line
@@ -2045,9 +2045,7 @@ struct clk_ops tegra30_periph_clk_ops = { 
static int tegra30_dsib_clk_set_parent(struct clk_hw *hw, u8 index)

{

	struct clk *d = clk_get_sys(NULL, "pll_d");

	/* The DSIB parent selection bit is in PLLD base

	   register - can not do direct r-m-w, must be

	   protected by PLLD lock */

	/* The DSIB parent selection bit is in PLLD base register */

	tegra_clk_cfg_ex(

		d, TEGRA_CLK_PLLD_MIPI_MUX_SEL, index);

drivers/amba/tegra-ahb.c

+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ int tegra_ahb_enable_smmu(struct device_node *dn) 
EXPORT_SYMBOL(tegra_ahb_enable_smmu);

#endif



#ifdef CONFIG_PM_SLEEP

static int tegra_ahb_suspend(struct device *dev)

{

	int i;
@@ -176,6 +177,7 @@ static int tegra_ahb_resume(struct device *dev) 
		gizmo_writel(ahb, ahb->ctx[i], tegra_ahb_gizmo[i]);

	return 0;

}

#endif



static UNIVERSAL_DEV_PM_OPS(tegra_ahb_pm,

			    tegra_ahb_suspend,