diff options
author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2012-06-05 00:29:39 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-06-12 12:32:31 -0400 |
commit | f762470b522014ce4ebda3ecac74eb6658da7d9d (patch) | |
tree | dfc4ab942963286b51da0e58b535275a6f630185 /drivers/input | |
parent | 20de12ccf900d71eee1344adc7ae0dcd7db9b4ab (diff) |
Input: tegra-kbc - add clk_prepare/clk_unprepare
Use clk_prepare/clk_unprepare as required by the generic clk framework.
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/tegra-kbc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index 4ffe64d53107..2c1c9ed1bd9f 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c | |||
@@ -492,7 +492,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc) | |||
492 | unsigned int debounce_cnt; | 492 | unsigned int debounce_cnt; |
493 | u32 val = 0; | 493 | u32 val = 0; |
494 | 494 | ||
495 | clk_enable(kbc->clk); | 495 | clk_prepare_enable(kbc->clk); |
496 | 496 | ||
497 | /* Reset the KBC controller to clear all previous status.*/ | 497 | /* Reset the KBC controller to clear all previous status.*/ |
498 | tegra_periph_reset_assert(kbc->clk); | 498 | tegra_periph_reset_assert(kbc->clk); |
@@ -556,7 +556,7 @@ static void tegra_kbc_stop(struct tegra_kbc *kbc) | |||
556 | disable_irq(kbc->irq); | 556 | disable_irq(kbc->irq); |
557 | del_timer_sync(&kbc->timer); | 557 | del_timer_sync(&kbc->timer); |
558 | 558 | ||
559 | clk_disable(kbc->clk); | 559 | clk_disable_unprepare(kbc->clk); |
560 | } | 560 | } |
561 | 561 | ||
562 | static int tegra_kbc_open(struct input_dev *dev) | 562 | static int tegra_kbc_open(struct input_dev *dev) |