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>

diff --cc arch/arm/Kconfig
index 46e2b5228606c725f5e3fe4226d57c55146842da,f0f90f06f84bde509483756f28735bc60c024622..d423d58f938dc40fb5b3c01445b9184572631b10
--- 1/arch/arm/Kconfig
--- 2/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/configs/omap2plus_defconfig
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mach-imx/headsmp.S
index a58c8b0527ccb3aad1f542b83a159c868a61655d,524e52e59d6c15b575fb355ed8ff7a474846faf7..67b9c48dcafe7dc1ee281c49ece9de88338297f4
--- 1/arch/arm/mach-imx/headsmp.S
--- 2/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-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-prima2/Kconfig
index 80ca974b2f828de48e6e99ba4204662f08babacb,5e6ab9d6f50f0d1a8f97bca14f0563b63f6acda0..6988b117fc174a70e049df575417dea3093daa1b
--- 1/arch/arm/mach-prima2/Kconfig
--- 2/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
  

diff --cc arch/arm/mach-spear/spear13xx.c
Simple merge

diff --cc arch/arm/mach-tegra/Kconfig
Simple merge

diff --cc arch/arm/mach-ux500/Kconfig
Simple merge