aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/common.c
diff options
context:
space:
mode:
authorChander Kashyap <chander.kashyap@linaro.org>2013-06-19 00:29:35 +0900
committerKukjin Kim <kgene.kim@samsung.com>2013-06-19 04:09:37 +0900
commiteff4e7c7f32a4e4be60b19b209ffab5cb430b385 (patch)
tree300a842306be4a5640912c497544bfc25b16d1bb /arch/arm/mach-exynos/common.c
parentARM: EXYNOS: add secondary CPU boot base location for EXYNOS5420 (diff)
downloadlinux-dev-eff4e7c7f32a4e4be60b19b209ffab5cb430b385.tar.xz
linux-dev-eff4e7c7f32a4e4be60b19b209ffab5cb430b385.zip
ARM: EXYNOS: extend soft-reset support for EXYNOS5420
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>
Diffstat (limited to 'arch/arm/mach-exynos/common.c')
-rw-r--r--arch/arm/mach-exynos/common.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index f323655737fb..8bc587cb165a 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -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);