openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpio: omap: prepare and unprepare the debounce clock 

Replace the clk_enable()s with a clk_prepare_enable() and
the clk_disables()s with a clk_disable_unprepare()

This never showed issues due to the OMAP platform code (hwmod)
leaving these clocks in clk_prepare()ed state by default.

Reported-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Acked-by: Javier Martinez Canillas <javier@dowhile0.org>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Rajendra Nayak 2014-04-23 11:41:03 +05:30 committed by Linus Walleij
parent 09ffa131c7
commit 345477ffe2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpio/gpio-omap.c
View File

@ -178,7 +178,7 @@ static inline void _gpio_rmw(void __iomem *base, u32 reg, u32 mask, bool set)
static inline void _gpio_dbck_enable(struct gpio_bank *bank) static inline void _gpio_dbck_enable(struct gpio_bank *bank)
{ {
if (bank->dbck_enable_mask && !bank->dbck_enabled) { if (bank->dbck_enable_mask && !bank->dbck_enabled) {
clk_enable(bank->dbck); clk_prepare_enable(bank->dbck);
bank->dbck_enabled = true; bank->dbck_enabled = true;
writel_relaxed(bank->dbck_enable_mask, writel_relaxed(bank->dbck_enable_mask,
@ -196,7 +196,7 @@ static inline void _gpio_dbck_disable(struct gpio_bank *bank)
*/ */
writel_relaxed(0, bank->base + bank->regs->debounce_en); writel_relaxed(0, bank->base + bank->regs->debounce_en);
clk_disable(bank->dbck); clk_disable_unprepare(bank->dbck);
bank->dbck_enabled = false; bank->dbck_enabled = false;
} }
} }
@ -229,7 +229,7 @@ static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
l = GPIO_BIT(bank, gpio); l = GPIO_BIT(bank, gpio);
clk_enable(bank->dbck); clk_prepare_enable(bank->dbck);
reg = bank->base + bank->regs->debounce; reg = bank->base + bank->regs->debounce;
writel_relaxed(debounce, reg); writel_relaxed(debounce, reg);
@ -243,7 +243,7 @@ static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
bank->dbck_enable_mask = val; bank->dbck_enable_mask = val;
writel_relaxed(val, reg); writel_relaxed(val, reg);
clk_disable(bank->dbck); clk_disable_unprepare(bank->dbck);
/* /*
* Enable debounce clock per module. * Enable debounce clock per module.
* This call is mandatory because in omap_gpio_request() when * This call is mandatory because in omap_gpio_request() when
@ -288,7 +288,7 @@ static void _clear_gpio_debounce(struct gpio_bank *bank, unsigned gpio)
bank->context.debounce = 0; bank->context.debounce = 0;
writel_relaxed(bank->context.debounce, bank->base + writel_relaxed(bank->context.debounce, bank->base +
bank->regs->debounce); bank->regs->debounce);
clk_disable(bank->dbck); clk_disable_unprepare(bank->dbck);
bank->dbck_enabled = false; bank->dbck_enabled = false;
} }
} }