* [PATCH] ARM: EXYNOS: fix software reset logic for EXYNOS5440 SOC
@ 2013-05-23 12:15 이정석
2013-05-24 21:42 ` Kukjin Kim
0 siblings, 1 reply; 2+ messages in thread
From: 이정석 @ 2013-05-23 12:15 UTC (permalink / raw)
To: kgene.kim; +Cc: linux-samsung-soc
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@samsung.com>
---
arch/arm/mach-exynos/common.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 7f431dd..a22615d 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -317,9 +317,13 @@ 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.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: EXYNOS: fix software reset logic for EXYNOS5440 SOC
2013-05-23 12:15 [PATCH] ARM: EXYNOS: fix software reset logic for EXYNOS5440 SOC 이정석
@ 2013-05-24 21:42 ` Kukjin Kim
0 siblings, 0 replies; 2+ messages in thread
From: Kukjin Kim @ 2013-05-24 21:42 UTC (permalink / raw)
To: 이정석; +Cc: kgene.kim, linux-samsung-soc
On 05/23/13 21:15, 이정석 wrote:
>
> 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@samsung.com>
> ---
> arch/arm/mach-exynos/common.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
> index 7f431dd..a22615d 100644
> --- a/arch/arm/mach-exynos/common.c
> +++ b/arch/arm/mach-exynos/common.c
> @@ -317,9 +317,13 @@ 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");
line wrapped?
> + 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;
Looks good to me, applied after fixing line wrapped.
Thanks.
- Kukjin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-24 21:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-23 12:15 [PATCH] ARM: EXYNOS: fix software reset logic for EXYNOS5440 SOC 이정석
2013-05-24 21:42 ` Kukjin Kim
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.