Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce8ad883 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Shawn Guo
Browse files

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: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent a74f3058

arch/arm/mach-imx/system.c

+7 −13
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void mxc_restart(enum reboot_mode mode, const char *cmd) 
{

	unsigned int wcr_enable;



	if (wdog_clk)

	if (!IS_ERR(wdog_clk))

		clk_enable(wdog_clk);



	if (cpu_is_mx1())
@@ -79,12 +79,9 @@ void __init mxc_arch_reset_init(void __iomem *base) 
	wdog_base = base;



	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__);

		wdog_clk = NULL;

		return;

	}



	else

		clk_prepare(wdog_clk);

}
@@ -97,12 +94,9 @@ void __init mxc_arch_reset_init_dt(void) 
	WARN_ON(!wdog_base);



	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__);

		wdog_clk = NULL;

		return;

	}



	else

		clk_prepare(wdog_clk);

}