summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-davinci.c
diff options
context:
space:
mode:
authorMurali Karicheri <m-karicheri2@ti.com>2012-08-30 20:03:57 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-09-01 01:12:01 +0200
commitce6b658dc040cf4aa3a30f56115e81d15d91596e (patch)
treee49a85aebee543bb99b5e0cd7a8bfe7247c7effa /drivers/gpio/gpio-davinci.c
parentgpio: Remove broken mark for da9052 gpio driver (diff)
downloadlinux-ce6b658dc040cf4aa3a30f56115e81d15d91596e.tar.xz
linux-ce6b658dc040cf4aa3a30f56115e81d15d91596e.zip
gpio: davinci: 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: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-davinci.c')
-rw-r--r--drivers/gpio/gpio-davinci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 3d000169285d..17df6db5dca7 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -366,7 +366,7 @@ static int __init davinci_gpio_irq_setup(void)
PTR_ERR(clk));
return PTR_ERR(clk);
}
- clk_enable(clk);
+ clk_prepare_enable(clk);
/* Arrange gpio_to_irq() support, handling either direct IRQs or
* banked IRQs. Having GPIOs in the first GPIO bank use direct