diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2011-01-19 07:27:33 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-21 05:33:20 -0500 |
commit | bb58b3e8b18c542f30f898fff82f7ce58a4bdf7a (patch) | |
tree | 663b830f0532d7343d864fad7f06222a8ac034f4 /arch/arm/mach-mx5/clock-mx51-mx53.c | |
parent | 816ad741b6a168e1d0c182d10999c298fc281d17 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-mx5/clock-mx51-mx53.c')
-rw-r--r-- | arch/arm/mach-mx5/clock-mx51-mx53.c | 6 |
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 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 = { | |||
867 | .parent = &ckil_clk, | 867 | .parent = &ckil_clk, |
868 | }; | 868 | }; |
869 | 869 | ||
870 | static struct clk kpp_clk = { | ||
871 | .id = 0, | ||
872 | }; | ||
873 | |||
874 | static struct clk dummy_clk = { | 870 | static struct clk dummy_clk = { |
875 | .id = 0, | 871 | .id = 0, |
876 | }; | 872 | }; |
@@ -1302,7 +1298,7 @@ static struct clk_lookup mx51_lookups[] = { | |||
1302 | _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_ahb_clk) | 1298 | _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_ahb_clk) |
1303 | _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk) | 1299 | _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk) |
1304 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk) | 1300 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk) |
1305 | _REGISTER_CLOCK("imx-keypad", NULL, kpp_clk) | 1301 | _REGISTER_CLOCK("imx-keypad", NULL, dummy_clk) |
1306 | _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) | 1302 | _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) |
1307 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) | 1303 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) |
1308 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) | 1304 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) |