Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC platform updates from Olof Johansson:
 "This branch contains part 1 of the platform updates for 3.10.  Among
  the highlights:

   - Support for the new Atmel Cortex-A5 based platforms (SAMA5D3)
   - New support for CSR SiRFatlas6 SoCs
   - A handful of updates for NVidia T114 (a.k.a. Tegra 4)
   - A bunch of updates for the shmobile platforms
   - A handful of updates for davinci
   - A few updates for Qualcomm MSM
   - Plus a handful of other patches, defconfig updates, etc."

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (135 commits)
  ARM: tegra: pm: fix build error w/o PM_SLEEP
  ARM: davinci: ensure global variables are declared
  ARM: davinci: sram.c: fix incorrect type in assignment
  ARM: davinci: da8xx dt: make file local symbols static
  ARM: davinci: da8xx: add remoteproc support
  ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries
  ARM: socfpga: Add clock entries into device tree
  ARM: socfpga: Enable soft reset
  ARM: EXYNOS: replace cpumask by the corresponding macro
  ARM: EXYNOS: handle properly the return values
  ARM: EXYNOS: factor out the idle states
  ARM: OMAP4: Enable fix for Cortex-A9 erratas
  ARM: OMAP2+: Export SoC information to userspace
  ARM: OMAP2+: SoC name and revision unification
  ARM: OMAP2+: Move common part of late init into common function
  ARM: tegra: pm: remove duplicated include from pm.c
  ARM: davinci: da850: override mmc DT node device name
  ARM: davinci: da850: add mmc DT entries
  mmc: davinci_mmc: add DT support
  ARM: SAMSUNG: check processor type before cache restoration in resume
  ...

diff --cc Documentation/kernel-parameters.txt
index 8c01a0218a1e0e9e08470215e495d7ae0c0be7c0,4a6d96214eedfad0c9382cd1c493239fb3298aaa..9653cf2f97279e5fda2257ed3221ce50fb6129c2
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -44,7 -44,7 +44,8 @@@ parameter is applicable
        AVR32   AVR32 architecture is enabled.
        AX25    Appropriate AX.25 support is enabled.
        BLACKFIN Blackfin architecture is enabled.
 +      CLK     Common clock infrastructure is enabled.
+       CMA     Contiguous Memory Area support is enabled.
        DRM     Direct Rendering Management support is enabled.
        DYNAMIC_DEBUG Build in debug messages and enable them at runtime
        EDD     BIOS Enhanced Disk Drive Services (EDD) is enabled

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/msm8660-surf.dts
Simple merge

diff --cc arch/arm/boot/dts/msm8960-cdp.dts
Simple merge

diff --cc arch/arm/configs/lpc32xx_defconfig
Simple merge

diff --cc arch/arm/configs/mxs_defconfig
index 87924d671115928509d5bd360f1ea92a8c50acc6,e9b1f6d4be5d8c2057e2627fefc12d259a5052ca..7ba48d22bcd9e803280d77eae926ae33bdd07984
--- 1/arch/arm/configs/mxs_defconfig
--- 2/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@@ -120,9 -122,9 +122,10 @@@ CONFIG_USB_EHCI_HCD=
  CONFIG_USB_CHIPIDEA=y
  CONFIG_USB_CHIPIDEA_HOST=y
  CONFIG_USB_STORAGE=y
 +CONFIG_USB_PHY=y
  CONFIG_USB_MXS_PHY=y
  CONFIG_MMC=y
+ CONFIG_MMC_UNSAFE_RESUME=y
  CONFIG_MMC_MXS=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y

diff --cc arch/arm/mach-at91/at91rm9200.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9n12.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9x5.c
Simple merge

diff --cc arch/arm/mach-at91/setup.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm355-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/dm355.c
Simple merge

diff --cc arch/arm/mach-davinci/dm365.c
Simple merge

diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/cpuidle.c
index 498a7a23e2607dfca7dd5db35e3c4eeab3c1027c,e2689d1133b9dc62963212ac405b3ca93741b531..17a18ff3d71e289df9909cb3976d6e414c768dff
--- 1/arch/arm/mach-exynos/cpuidle.c
--- 2/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@@ -58,6 -46,20 +46,19 @@@ static DEFINE_PER_CPU(struct cpuidle_de
  static struct cpuidle_driver exynos4_idle_driver = {
        .name                   = "exynos4_idle",
        .owner                  = THIS_MODULE,
 -      .en_core_tk_irqen       = 1,
+       .states = {
+               [0] = ARM_CPUIDLE_WFI_STATE,
+               [1] = {
+                       .enter                  = exynos4_enter_lowpower,
+                       .exit_latency           = 300,
+                       .target_residency       = 100000,
+                       .flags                  = CPUIDLE_FLAG_TIME_VALID,
+                       .name                   = "C1",
+                       .desc                   = "ARM power down",
+               },
+       },
+       .state_count = 2,
+       .safe_state_index = 0,
  };
  
  /* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */

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

diff --cc arch/arm/mach-omap2/cclock33xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/common.h
Simple merge

diff --cc arch/arm/mach-omap2/id.c
index ff0bc9e51aa777ad42a9d7661fc575624c21960c,098e94e3133608128bf8c14242c7a07a53fc83ff..2fb17caa86834ce7f2bc3df26a4fba15b3387a36
--- 1/arch/arm/mach-omap2/id.c
--- 2/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@@ -550,11 -561,13 +567,13 @@@ void __init omap5xxx_check_revision(voi
  
        default:
                /* Unknown default to latest silicon rev as default*/
 -              omap_revision = OMAP5430_REV_ES1_0;
 +              omap_revision = OMAP5430_REV_ES2_0;
        }
  
-       pr_info("OMAP%04x ES%d.0\n",
-                       omap_rev() >> 16, ((omap_rev() >> 12) & 0xf));
+       sprintf(soc_name, "OMAP%04x", omap_rev() >> 16);
+       sprintf(soc_rev, "ES%d.0", (omap_rev() >> 12) & 0xf);
+ 
+       pr_info("%s %s\n", soc_name, soc_rev);
  }
  
  /*

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/common.h
Simple merge

diff --cc arch/arm/mach-tegra/Makefile
index c1970005f8056d0c54e6480487efb91c9f90def8,e40326d0e29fa8fb6dff8e694f8539ca09e8e31f..b78f0d71b328b929696b7592bd68fa7e597e552a
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -25,8 -25,10 +25,9 @@@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)              += cpu
  endif
  obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
 -obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
  obj-$(CONFIG_TEGRA_PCI)                       += pcie.o
  
+ obj-$(CONFIG_ARCH_TEGRA_114_SOC)      += tegra114_speedo.o
  ifeq ($(CONFIG_CPU_IDLE),y)
  obj-$(CONFIG_ARCH_TEGRA_114_SOC)      += cpuidle-tegra114.o
  endif

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

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

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