summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/serial.c
diff options
context:
space:
mode:
authorm-karicheri2@ti.com <m-karicheri2@ti.com>2012-08-02 16:53:48 +0000
committerSekhar Nori <nsekhar@ti.com>2012-10-24 16:52:05 +0530
commitb6f1ffed9d8a830ab94fd3fc6182e2fc8c77cba0 (patch)
tree3b4e4b12aa6af73d0f5d3c0c0a822acf7de7c823 /arch/arm/mach-davinci/serial.c
parent6f0c0580b70c89094b3422ba81118c7b959c7556 (diff)
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/serial.c')
-rw-r--r--arch/arm/mach-davinci/serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c
index 1875740fe27c..24ddb0d32a0f 100644
--- a/arch/arm/mach-davinci/serial.c
+++ b/arch/arm/mach-davinci/serial.c
@@ -95,7 +95,7 @@ int __init davinci_serial_init(struct davinci_uart_config *info)
continue;
}
- clk_enable(uart_clk);
+ clk_prepare_enable(uart_clk);
p->uartclk = clk_get_rate(uart_clk);
if (!p->membase && p->mapbase) {