---

yaml --- r: 355124 b: refs/heads/master c: 60db7e5 h: refs/heads/master v: v3
git-mirror · Jan 28, 2013 · 3e80880 · 3e80880
1 parent 01a2103
commit 3e80880
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e877a5aa178d2288212a6bd254324b8756c098c1
+refs/heads/master: 60db7e5f9c9a25a7a9b01007e6e3f5a93bc16a3a
diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c
@@ -299,15 +299,17 @@ void exynos4_restart(char mode, const char *cmd)
 
 void exynos5_restart(char mode, const char *cmd)
 {
+	struct device_node *np;
 	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 = (0x10 << 20) | (0x1 << 16);
-		addr = EXYNOS5440_SWRESET;
+		np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock");
+		addr = of_iomap(np, 0) + 0xcc;
+		val = (0xfff << 20) | (0x1 << 16);
 	} else {
 		pr_err("%s: cannot support non-DT\n", __func__);
 		return;