diff mbox

[v2] Input: imx_keypad - Fix missing clk conversions

Message ID 1346765945-31453-1-git-send-email-fabio.estevam@freescale.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fabio Estevam Sept. 4, 2012, 1:39 p.m. UTC 
commit a1e636e6d3 (Input: imx_keypad - adapt the new kpp clock name)
missed to update clk_enable/clk_disable from imx_keypad_probe().

Fix it so that we do not get clk warnings at boot.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Add commit id
 drivers/input/keyboard/imx_keypad.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Dmitry Torokhov Sept. 5, 2012, 6:06 a.m. UTC | #1 
On Tue, Sep 04, 2012 at 10:39:05AM -0300, Fabio Estevam wrote:
> commit a1e636e6d3 (Input: imx_keypad - adapt the new kpp clock name)
> missed to update clk_enable/clk_disable from imx_keypad_probe().
> 
> Fix it so that we do not get clk warnings at boot.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Applied, thank you Fabio.

> ---
> Changes since v1:
> - Add commit id
>  drivers/input/keyboard/imx_keypad.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
> index ce68e36..cdc2526 100644
> --- a/drivers/input/keyboard/imx_keypad.c
> +++ b/drivers/input/keyboard/imx_keypad.c
> @@ -516,9 +516,9 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev)
>  	input_set_drvdata(input_dev, keypad);
>  
>  	/* Ensure that the keypad will stay dormant until opened */
> -	clk_enable(keypad->clk);
> +	clk_prepare_enable(keypad->clk);
>  	imx_keypad_inhibit(keypad);
> -	clk_disable(keypad->clk);
> +	clk_disable_unprepare(keypad->clk);
>  
>  	error = request_irq(irq, imx_keypad_irq_handler, 0,
>  			    pdev->name, keypad);
> -- 
> 1.7.9.5
> 
>
diff mbox

Patch

diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index ce68e36..cdc2526 100644
--- a/drivers/input/keyboard/imx_keypad.c
+++ b/drivers/input/keyboard/imx_keypad.c
@@ -516,9 +516,9 @@  static int __devinit imx_keypad_probe(struct platform_device *pdev)
 	input_set_drvdata(input_dev, keypad);
 
 	/* Ensure that the keypad will stay dormant until opened */
-	clk_enable(keypad->clk);
+	clk_prepare_enable(keypad->clk);
 	imx_keypad_inhibit(keypad);
-	clk_disable(keypad->clk);
+	clk_disable_unprepare(keypad->clk);
 
 	error = request_irq(irq, imx_keypad_irq_handler, 0,
 			    pdev->name, keypad);