diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2012-07-06 20:26:37 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-07 04:12:35 +0200 |
| commit | a40ec72d540553fc0e1d1fea94c1d7629b7f35f4 (patch) | |
| tree | c2d5af80fda379ca19b8486f58f853bf924016de /drivers/input/keyboard/imx_keypad.c | |
| parent | Input: imx_keypad - use clk_prepare_enable/clk_disable_unprepare() (diff) | |
| download | linux-a40ec72d540553fc0e1d1fea94c1d7629b7f35f4.tar.xz linux-a40ec72d540553fc0e1d1fea94c1d7629b7f35f4.zip | |
Input: imx_keypad - adapt the new kpp clock name
With the new i.mx clock framework we should pass NULL as the keypad
clock name.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard/imx_keypad.c')
| -rw-r--r-- | drivers/input/keyboard/imx_keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index 9d57945db53d..4830615ed2ec 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -467,7 +467,7 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev) goto failed_free_priv; } - keypad->clk = clk_get(&pdev->dev, "kpp"); + keypad->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(keypad->clk)) { dev_err(&pdev->dev, "failed to get keypad clock\n"); error = PTR_ERR(keypad->clk); |