|
@@ -378,7 +378,7 @@ static void imx_keypad_close(struct input_dev *dev)
|
|
|
imx_keypad_inhibit(keypad);
|
|
|
|
|
|
/* Disable clock unit */
|
|
|
- clk_disable(keypad->clk);
|
|
|
+ clk_disable_unprepare(keypad->clk);
|
|
|
}
|
|
|
|
|
|
static int imx_keypad_open(struct input_dev *dev)
|
|
@@ -391,7 +391,7 @@ static int imx_keypad_open(struct input_dev *dev)
|
|
|
keypad->enabled = true;
|
|
|
|
|
|
/* Enable the kpp clock */
|
|
|
- clk_enable(keypad->clk);
|
|
|
+ clk_prepare_enable(keypad->clk);
|
|
|
imx_keypad_config(keypad);
|
|
|
|
|
|
/* Sanity control, not all the rows must be actived now. */
|
|
@@ -581,7 +581,7 @@ static int imx_kbd_suspend(struct device *dev)
|
|
|
mutex_lock(&input_dev->mutex);
|
|
|
|
|
|
if (input_dev->users)
|
|
|
- clk_disable(kbd->clk);
|
|
|
+ clk_disable_unprepare(kbd->clk);
|
|
|
|
|
|
mutex_unlock(&input_dev->mutex);
|
|
|
|
|
@@ -603,7 +603,7 @@ static int imx_kbd_resume(struct device *dev)
|
|
|
mutex_lock(&input_dev->mutex);
|
|
|
|
|
|
if (input_dev->users)
|
|
|
- clk_enable(kbd->clk);
|
|
|
+ clk_prepare_enable(kbd->clk);
|
|
|
|
|
|
mutex_unlock(&input_dev->mutex);
|
|
|
|