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

Commit 5235f57a authored by Karicheri, Muralidharan's avatar Karicheri, Muralidharan Committed by Wim Van Sebroeck
Browse files

davinci_wdt: preparation for switch to common clock framework 



As a first step towards migrating davinci platforms to use common clock
framework, replace all instances of clk_enable() with clk_prepare_enable()
and clk_disable() with clk_disable_unprepare(). Until the platform is
switched to use the CONFIG_HAVE_CLK_PREPARE Kconfig variable, this just
adds a might_sleep() call and would work without any issues.

This will make it easy later to switch to common clk based implementation
of clk driver from DaVinci specific driver.

Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 63fbbc16

drivers/watchdog/davinci_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int davinci_wdt_probe(struct platform_device *pdev) 
	if (WARN_ON(IS_ERR(wdt_clk)))

		return PTR_ERR(wdt_clk);



	clk_enable(wdt_clk);

	clk_prepare_enable(wdt_clk);



	if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)

		heartbeat = DEFAULT_HEARTBEAT;
@@ -256,7 +256,7 @@ static int davinci_wdt_remove(struct platform_device *pdev) 
		wdt_mem = NULL;

	}



	clk_disable(wdt_clk);

	clk_disable_unprepare(wdt_clk);

	clk_put(wdt_clk);



	return 0;