From: Olof Johansson <olof@lixom.net>
Date: Thu, 9 May 2013 20:05:00 +0000 (-0700)
Subject: Merge branch 'late/fixes' into fixes
X-Git-Tag: v3.10-rc1~23^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5497e7b8967118ee45f8ef2d301fce919a35d660;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'late/fixes' into fixes

* late/fixes:
  ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
  ARM: ux500: always select ABX500_CORE
  ARM: SIRF: select SMP_ON_UP only on SMP builds
  ARM: SPEAr: conditionalize l2x0 support
  ARM: imx: build CPU suspend code only when needed
  ARM: OMAP: build SMP code only for OMAP4/5
  ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
  ARM: default machine descriptor for multiplatform

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

5497e7b8967118ee45f8ef2d301fce919a35d660
diff --cc arch/arm/Kconfig
index 46e2b5228606c,f0f90f06f84bd..d423d58f938dc
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -894,10 -1011,9 +894,9 @@@ config ARCH_MULTI_V
  	select CPU_V6
  
  config ARCH_MULTI_V7
 -	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
 +	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
  	default y
  	select ARCH_MULTI_V6_V7
- 	select ARCH_VEXPRESS
  	select CPU_V7
  
  config ARCH_MULTI_V6_V7
diff --cc arch/arm/mach-imx/headsmp.S
index a58c8b0527ccb,524e52e59d6c1..67b9c48dcafe7
--- a/arch/arm/mach-imx/headsmp.S
+++ b/arch/arm/mach-imx/headsmp.S
@@@ -24,12 -24,14 +24,12 @@@ ENTRY(v7_secondary_startup
  ENDPROC(v7_secondary_startup)
  #endif
  
- #ifdef CONFIG_PM
+ #ifdef CONFIG_ARM_CPU_SUSPEND
  /*
 - * The following code is located into the .data section.  This is to
 - * allow phys_l2x0_saved_regs to be accessed with a relative load
 - * as we are running on physical address here.
 + * The following code must assume it is running from physical address
 + * where absolute virtual addresses to the data section have to be
 + * turned into relative ones.
   */
 -	.data
 -	.align
  
  #ifdef CONFIG_CACHE_L2X0
  	.macro	pl310_resume
diff --cc arch/arm/mach-prima2/Kconfig
index 80ca974b2f828,5e6ab9d6f50f0..6988b117fc174
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@@ -36,9 -16,8 +36,9 @@@ config ARCH_MARC
  	default y
  	select ARM_GIC
  	select CPU_V7
 +	select HAVE_ARM_SCU if SMP
  	select HAVE_SMP
- 	select SMP_ON_UP
+ 	select SMP_ON_UP if SMP
  	help
            Support for CSR SiRFSoC ARM Cortex A9 Platform