[PATCH v2] ARM: mx5: fix keypad clock name

[PATCH v2] ARM: mx5: fix keypad clock name

[Fabio Estevam]

This fixes the following error during keypad driver probe:

imx-keypad imx-keypad: failed to get keypad clock
imx-keypad: probe of imx-keypad failed with error -2

commit 3f88014 (ARM: imx: dynamically allocate imx-keypad devices)
uses id=-1 for imx_kpp_device, so change the clock name accordingly.

Tested keypad successfully on a MX51_3DS board.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/mach-mx5/clock-mx51-mx53.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
index 344ee8e..57fea05 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1091,7 +1091,7 @@ static struct clk_lookup mx51_lookups[] = {
 	_REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", ahb_clk)
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
-	_REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
+	_REGISTER_CLOCK("imx-keypad", NULL, kpp_clk)
 	_REGISTER_CLOCK("mxc_nand", NULL, nfc_clk)
 	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
 	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
-- 
1.6.0.4

[PATCH v2] ARM: mx5: fix keypad clock name

[Uwe Kleine-König]

Hello Fabio,

On Tue, Nov 30, 2010 at 05:13:36PM -0200, Fabio Estevam wrote:
> This fixes the following error during keypad driver probe:
> 
> imx-keypad imx-keypad: failed to get keypad clock
> imx-keypad: probe of imx-keypad failed with error -2
> 
> commit 3f88014 (ARM: imx: dynamically allocate imx-keypad devices)
> uses id=-1 for imx_kpp_device, so change the clock name accordingly.
This is true, but the reasoning is broken.  3f88014 uses -1, but only
with your patch that makes mx51 use the function introduced in 3f88014
this becomes a problem for mx51.

I suggest to squash this into your patch and adding a short notice to
the commit log why this is necessary.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |