[<prev] [next>] [day] [month] [year] [list]
Message-id: <000101ce5cdf$abbdd410$03397c30$%choi@samsung.com>
Date: Thu, 30 May 2013 11:44:56 +0900
From: Jonghwan Choi <jhbird.choi@...sung.com>
To: 'Jonghwan Choi' <jhbird.choi@...sung.com>,
linux-kernel@...r.kernel.org
Cc: stable@...r.kernel.org, 'Jungseok Lee' <jays.lee@...sung.com>,
'Kukjin Kim' <kgene.kim@...sung.com>
Subject: [PATCH 3.9-stable] ARM: EXYNOS: fix software reset logic for
EXYNOS5440 SOC
This patch looks like it should be in the 3.9-stable tree, should we apply
it?
------------------
From: "Jungseok Lee <jays.lee@...sung.com>"
commit 1ba830c9997214a7fbe4d91cf238793764620e3b upstream
This patch fixes software reset logic. Software reset applies only to
powered-on domains in SOC because software reset to all domains causes
reboot failure.
Signed-off-by: Jungseok Lee <jays.lee@...sung.com>
Signed-off-by: Kukjin Kim <kgene.kim@...sung.com>
Signed-off-by: Jonghwan Choi <jhbird.choi@...sung.com>
---
arch/arm/mach-exynos/common.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index d63d399..4d962ec 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -308,9 +308,16 @@ void exynos5_restart(char mode, const char *cmd)
val = 0x1;
addr = EXYNOS_SWRESET;
} else if (of_machine_is_compatible("samsung,exynos5440")) {
+ u32 status;
np = of_find_compatible_node(NULL, NULL,
"samsung,exynos5440-clock");
+
+ addr = of_iomap(np, 0) + 0xbc;
+ status = __raw_readl(addr);
+
addr = of_iomap(np, 0) + 0xcc;
- val = (0xfff << 20) | (0x1 << 16);
+ val = __raw_readl(addr);
+
+ val = (val & 0xffff0000) | (status & 0xffff);
} else {
pr_err("%s: cannot support non-DT\n", __func__);
return;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists