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

Pull ARM SoC platform changes from Arnd Bergmann:
 "New and updated SoC support, notable changes include:

   - bcm:
        brcmstb SMP support
        initial iproc/cygnus support
   - exynos:
        Exynos4415 SoC support
        PMU and suspend support for Exynos5420
        PMU support for Exynos3250
        pm related maintenance
   - imx:
        new LS1021A SoC support
        vybrid 610 global timer support
   - integrator:
        convert to using multiplatform configuration
   - mediatek:
        earlyprintk support for mt8127/mt8135
   - meson:
        meson8 soc and l2 cache controller support
   - mvebu:
        Armada 38x CPU hotplug support
        drop support for prerelease Armada 375 Z1 stepping
        extended suspend support, now works on Armada 370/XP
   - omap:
        hwmod related maintenance
        prcm cleanup
   - pxa:
        initial pxa27x DT handling
   - rockchip:
        SMP support for rk3288
        add cpu frequency scaling support
   - shmobile:
        r8a7740 power domain support
        various small restart, timer, pci apmu changes
   - sunxi:
        Allwinner A80 (sun9i) earlyprintk support
   - ux500:
        power domain support

  Overall, a significant chunk of changes, coming mostly from the usual
  suspects: omap, shmobile, samsung and mvebu, all of which already
  contain a lot of platform specific code in arch/arm"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (187 commits)
  ARM: mvebu: use the cpufreq-dt platform_data for independent clocks
  soc: integrator: Add terminating entry for integrator_cm_match
  ARM: mvebu: add SDRAM controller description for Armada XP
  ARM: mvebu: adjust mbus controller description on Armada 370/XP
  ARM: mvebu: add suspend/resume DT information for Armada XP GP
  ARM: mvebu: synchronize secondary CPU clocks on resume
  ARM: mvebu: make sure MMU is disabled in armada_370_xp_cpu_resume
  ARM: mvebu: Armada XP GP specific suspend/resume code
  ARM: mvebu: reserve the first 10 KB of each memory bank for suspend/resume
  ARM: mvebu: implement suspend/resume support for Armada XP
  clk: mvebu: add suspend/resume for gatable clocks
  bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration
  bus: mvebu-mbus: suspend/resume support
  clocksource: time-armada-370-xp: add suspend/resume support
  irqchip: armada-370-xp: Add suspend/resume support
  ARM: add lolevel debug support for asm9260
  ARM: add mach-asm9260
  ARM: EXYNOS: use u8 for val[] in struct exynos_pmu_conf
  power: reset: imx-snvs-poweroff: add power off driver for i.mx6
  ARM: imx: temporarily remove CONFIG_SOC_FSL from LS1021A
  ...

1 files changed, 6 insertions, 24 deletions

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 6de7cf5ef2b2..c13d0837fa8c 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -87,28 +87,6 @@ static struct map_desc exynos5_iodesc[] __initdata = {
         },
 };
 
-static void exynos_restart(enum reboot_mode mode, const char *cmd)
-{
-        struct device_node *np;
-        u32 val = 0x1;
-        void __iomem *addr = pmu_base_addr + EXYNOS_SWRESET;
-
-        if (of_machine_is_compatible("samsung,exynos5440")) {
-                u32 status;
-                np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock");
-
-                addr = of_iomap(np, 0) + 0xbc;
-                status = __raw_readl(addr);
-
-                addr = of_iomap(np, 0) + 0xcc;
-                val = __raw_readl(addr);
-
-                val = (val & 0xffff0000) | (status & 0xffff);
-        }
-
-        __raw_writel(val, addr);
-}
-
 static struct platform_device exynos_cpuidle = {
         .name              = "exynos_cpuidle",
 #ifdef CONFIG_ARM_EXYNOS_CPUIDLE
@@ -202,6 +180,7 @@ static const struct of_device_id exynos_dt_pmu_match[] = {
         { .compatible = "samsung,exynos4210-pmu" },
         { .compatible = "samsung,exynos4212-pmu" },
         { .compatible = "samsung,exynos4412-pmu" },
+        { .compatible = "samsung,exynos4415-pmu" },
         { .compatible = "samsung,exynos5250-pmu" },
         { .compatible = "samsung,exynos5260-pmu" },
         { .compatible = "samsung,exynos5410-pmu" },
@@ -268,7 +247,10 @@ static void __init exynos_dt_machine_init(void)
                 exynos_sysram_init();
 
         if (of_machine_is_compatible("samsung,exynos4210") ||
-                        of_machine_is_compatible("samsung,exynos5250"))
+            of_machine_is_compatible("samsung,exynos4212") ||
+            (of_machine_is_compatible("samsung,exynos4412") &&
+             of_machine_is_compatible("samsung,trats2")) ||
+            of_machine_is_compatible("samsung,exynos5250"))
                 platform_device_register(&exynos_cpuidle);
 
         platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
@@ -283,6 +265,7 @@ static char const *exynos_dt_compat[] __initconst = {
         "samsung,exynos4210",
         "samsung,exynos4212",
         "samsung,exynos4412",
+        "samsung,exynos4415",
         "samsung,exynos5",
         "samsung,exynos5250",
         "samsung,exynos5260",
@@ -328,7 +311,6 @@ DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)")
         .init_machine   = exynos_dt_machine_init,
         .init_late      = exynos_init_late,
         .dt_compat      = exynos_dt_compat,
-        .restart        = exynos_restart,
         .reserve        = exynos_reserve,
         .dt_fixup       = exynos_dt_fixup,
 MACHINE_END