]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ARM: EXYNOS: extend soft-reset support for EXYNOS5420
authorChander Kashyap <chander.kashyap@linaro.org>
Tue, 18 Jun 2013 15:29:35 +0000 (00:29 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 18 Jun 2013 19:09:37 +0000 (04:09 +0900)
Extend the soft reset support for EXYNOS5420 SoC.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-exynos/common.c

index f323655737fbe851c5c5232ccaf48a35cee7bc86..8bc587cb165a2d2c442a5aeb2f3411679f657400 100644 (file)
@@ -329,10 +329,10 @@ void exynos5_restart(char mode, const char *cmd)
        u32 val;
        void __iomem *addr;
 
-       if (of_machine_is_compatible("samsung,exynos5250")) {
-               val = 0x1;
-               addr = EXYNOS_SWRESET;
-       } else if (of_machine_is_compatible("samsung,exynos5440")) {
+       val = 0x1;
+       addr = EXYNOS_SWRESET;
+
+       if (of_machine_is_compatible("samsung,exynos5440")) {
                u32 status;
                np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock");
 
@@ -343,9 +343,6 @@ void exynos5_restart(char mode, const char *cmd)
                val = __raw_readl(addr);
 
                val = (val & 0xffff0000) | (status & 0xffff);
-       } else {
-               pr_err("%s: cannot support non-DT\n", __func__);
-               return;
        }
 
        __raw_writel(val, addr);