| Message ID | 003001ce57af$435c0340$ca1409c0$%lee@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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__);
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(-) return;