diff options
| author | m-karicheri2@ti.com <m-karicheri2@ti.com> | 2012-08-02 18:53:48 +0200 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2012-10-24 13:22:05 +0200 |
| commit | b6f1ffed9d8a830ab94fd3fc6182e2fc8c77cba0 (patch) | |
| tree | 3b4e4b12aa6af73d0f5d3c0c0a822acf7de7c823 /arch/arm/mach-davinci/time.c | |
| parent | Linux 3.7-rc2 (diff) | |
| download | linux-b6f1ffed9d8a830ab94fd3fc6182e2fc8c77cba0.tar.xz linux-b6f1ffed9d8a830ab94fd3fc6182e2fc8c77cba0.zip | |
ARM: davinci: convert platform code to use clk_prepare/clk_unprepare
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: Murali Karicheri <m-karicheri2@ti.com>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/time.c')
| -rw-r--r-- | arch/arm/mach-davinci/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 75da315b6587..9847938785ca 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c @@ -379,7 +379,7 @@ static void __init davinci_timer_init(void) timer_clk = clk_get(NULL, "timer0"); BUG_ON(IS_ERR(timer_clk)); - clk_enable(timer_clk); + clk_prepare_enable(timer_clk); /* init timer hw */ timer_init(); @@ -429,7 +429,7 @@ void davinci_watchdog_reset(struct platform_device *pdev) wd_clk = clk_get(&pdev->dev, NULL); if (WARN_ON(IS_ERR(wd_clk))) return; - clk_enable(wd_clk); + clk_prepare_enable(wd_clk); /* disable, internal clock source */ __raw_writel(0, base + TCR); |