diff options
author | Thomas Abraham <thomas.ab@samsung.com> | 2013-01-24 13:09:13 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-28 17:27:50 -0500 |
commit | 60db7e5f9c9a25a7a9b01007e6e3f5a93bc16a3a (patch) | |
tree | 6464e260560d43c20a2dd01321215da97846bf38 /arch/arm/mach-exynos/common.c | |
parent | e877a5aa178d2288212a6bd254324b8756c098c1 (diff) |
ARM: EXYNOS: Fix crash on soft reset on EXYNOS5440
The soft-reset control register is located in the XMU controller space.
Map this controller space before writing to the soft-reset controller
register.
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Girish K S <ks.giri@samsung.com>
Signed-off-by: Kukjin <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/common.c')
-rw-r--r-- | arch/arm/mach-exynos/common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index e07da6e186a3..0c7e3ad7ba93 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -299,6 +299,7 @@ void exynos4_restart(char mode, const char *cmd) | |||
299 | 299 | ||
300 | void exynos5_restart(char mode, const char *cmd) | 300 | void exynos5_restart(char mode, const char *cmd) |
301 | { | 301 | { |
302 | struct device_node *np; | ||
302 | u32 val; | 303 | u32 val; |
303 | void __iomem *addr; | 304 | void __iomem *addr; |
304 | 305 | ||
@@ -306,8 +307,9 @@ void exynos5_restart(char mode, const char *cmd) | |||
306 | val = 0x1; | 307 | val = 0x1; |
307 | addr = EXYNOS_SWRESET; | 308 | addr = EXYNOS_SWRESET; |
308 | } else if (of_machine_is_compatible("samsung,exynos5440")) { | 309 | } else if (of_machine_is_compatible("samsung,exynos5440")) { |
309 | val = (0x10 << 20) | (0x1 << 16); | 310 | np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); |
310 | addr = EXYNOS5440_SWRESET; | 311 | addr = of_iomap(np, 0) + 0xcc; |
312 | val = (0xfff << 20) | (0x1 << 16); | ||
311 | } else { | 313 | } else { |
312 | pr_err("%s: cannot support non-DT\n", __func__); | 314 | pr_err("%s: cannot support non-DT\n", __func__); |
313 | return; | 315 | return; |