From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Wed, 19 Jan 2011 12:27:33 +0000 (-0200)
Subject: ARM: mx5: Use dummy clock for the keypad
X-Git-Tag: MMI-PSA29.97-13-9~20486^2~5^2~120
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb58b3e8b18c542f30f898fff82f7ce58a4bdf7a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM: mx5: Use dummy clock for the keypad

Reuse dummy_clk for the imx-keypad device instead of using a dedicated kpp_clk.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
index 0a19e7567c0b..c66be0ee40c9 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -867,10 +867,6 @@ static struct clk gpt_32k_clk = {
 	.parent = &ckil_clk,
 };
 
-static struct clk kpp_clk = {
-	.id = 0,
-};
-
 static struct clk dummy_clk = {
 	.id = 0,
 };
@@ -1302,7 +1298,7 @@ static struct clk_lookup mx51_lookups[] = {
 	_REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_ahb_clk)
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
-	_REGISTER_CLOCK("imx-keypad", NULL, kpp_clk)
+	_REGISTER_CLOCK("imx-keypad", NULL, dummy_clk)
 	_REGISTER_CLOCK("mxc_nand", NULL, nfc_clk)
 	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
 	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)