Merge tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-exynos / exynos.c

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 37030753f25a020c44e7b9d360cbbd02c71f9a7c..b32a907d021d4a2b5a809a22899cb237464d0d57 100644 (file)
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/serial_s3c.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_fdt.h>
@@ -26,7 +27,6 @@
 #include <asm/memory.h>
 
 #include <plat/cpu.h>
-#include <plat/regs-serial.h>
 
 #include "common.h"
 #include "mfc.h"
@@ -242,6 +242,7 @@ void __init exynos_init_late(void)
                return;
 
        pm_genpd_poweroff_unused();
+       exynos_pm_init();
 }
 
 static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,
@@ -326,8 +327,10 @@ static int __init exynos4_l2x0_cache_init(void)
        if (ret)
                return ret;
 
-       l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
-       clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
+       if (IS_ENABLED(CONFIG_S5P_SLEEP)) {
+               l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
+               clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
+       }
        return 0;
 }
 early_initcall(exynos4_l2x0_cache_init);
@@ -367,9 +370,11 @@ static void __init exynos_dt_machine_init(void)
 }
 
 static char const *exynos_dt_compat[] __initconst = {
+       "samsung,exynos4",
        "samsung,exynos4210",
        "samsung,exynos4212",
        "samsung,exynos4412",
+       "samsung,exynos5",
        "samsung,exynos5250",
        "samsung,exynos5420",
        "samsung,exynos5440",