openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: i.MX system: Simplify handling watchdog clock 

This patch simplifies handling watchdog clock a bit.
As an additional change, now we properly check WDT clock in a reset
function.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
This commit is contained in:
Alexander Shiyan 2014-06-13 11:26:12 +04:00 committed by Shawn Guo
parent a74f30582d
commit ce8ad88387
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/mach-imx/system.c
View File

@ -42,7 +42,7 @@ void mxc_restart(enum reboot_mode mode, const char *cmd)
{ {
unsigned int wcr_enable; unsigned int wcr_enable;
if (wdog_clk) if (!IS_ERR(wdog_clk))
clk_enable(wdog_clk); clk_enable(wdog_clk);
if (cpu_is_mx1()) if (cpu_is_mx1())
@ -79,13 +79,10 @@ void __init mxc_arch_reset_init(void __iomem *base)
wdog_base = base; wdog_base = base;
wdog_clk = clk_get_sys("imx2-wdt.0", NULL); wdog_clk = clk_get_sys("imx2-wdt.0", NULL);
if (IS_ERR(wdog_clk)) { if (IS_ERR(wdog_clk))
pr_warn("%s: failed to get wdog clock\n", __func__); pr_warn("%s: failed to get wdog clock\n", __func__);
wdog_clk = NULL; else
return; clk_prepare(wdog_clk);
}
clk_prepare(wdog_clk);
} }
void __init mxc_arch_reset_init_dt(void) void __init mxc_arch_reset_init_dt(void)
@ -97,13 +94,10 @@ void __init mxc_arch_reset_init_dt(void)
WARN_ON(!wdog_base); WARN_ON(!wdog_base);
wdog_clk = of_clk_get(np, 0); wdog_clk = of_clk_get(np, 0);
if (IS_ERR(wdog_clk)) { if (IS_ERR(wdog_clk))
pr_warn("%s: failed to get wdog clock\n", __func__); pr_warn("%s: failed to get wdog clock\n", __func__);
wdog_clk = NULL; else
return; clk_prepare(wdog_clk);
}
clk_prepare(wdog_clk);
} }
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0