aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2011-01-19 10:27:33 -0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-21 11:33:20 +0100
commitbb58b3e8b18c542f30f898fff82f7ce58a4bdf7a (patch)
tree663b830f0532d7343d864fad7f06222a8ac034f4
parent816ad741b6a168e1d0c182d10999c298fc281d17 (diff)
downloadkernel_samsung_smdk4412-bb58b3e8b18c542f30f898fff82f7ce58a4bdf7a.zip
kernel_samsung_smdk4412-bb58b3e8b18c542f30f898fff82f7ce58a4bdf7a.tar.gz
kernel_samsung_smdk4412-bb58b3e8b18c542f30f898fff82f7ce58a4bdf7a.tar.bz2
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>
-rw-r--r--arch/arm/mach-mx5/clock-mx51-mx53.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
index 0a19e75..c66be0e 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)