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

Commit bdbaaf1a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'for-3.5/fixes' of... 

Merge branch 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/fixes

By Stephen Warren
via Stephen Warren
* 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA
  ARM: tegra: add pll_x freq table entry for 750MHz

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d48b97b4 3d5e8af4

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2281,7 +2281,7 @@ menu "Power management options" 
source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5PC100

	depends on !ARCH_S5PC100 && !ARCH_TEGRA

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

	def_bool y

arch/arm/mach-tegra/tegra2_clocks.c

+6 −0
Original line number Diff line number Diff line
@@ -1764,6 +1764,12 @@ static struct clk_pll_freq_table tegra_pll_x_freq_table[] = { 
	{ 19200000, 760000000,  950,  24, 1, 8},

	{ 26000000, 760000000,  760,  26, 1, 12},



	/* 750 MHz */

	{ 12000000, 750000000,  750,  12, 1, 12},

	{ 13000000, 750000000,  750,  13, 1, 12},

	{ 19200000, 750000000,  625,  16, 1, 8},

	{ 26000000, 750000000,  750,  26, 1, 12},



	/* 608 MHz */

	{ 12000000, 608000000,  608,  12, 1, 12},

	{ 13000000, 608000000,  608,  13, 1, 12},