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

[karo-tx-linux.git] / arch / arm / mach-exynos / exynos.c

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 6de7cf5ef2b29bf7e07ba53eb2a63f7d7589fdf0..c13d0837fa8cd3b5325c84e031416098b4c90fea 100644 (file)
--- 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