summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-07-26 16:08:53 -0300
committerSascha Hauer <s.hauer@pengutronix.de>2012-08-03 16:28:47 +0200
commit8cc7a2b9f75355f60922db4adf27742ba7f2f6bc (patch)
tree3740c72eb7970ffe7dfec5a092367cd68172b602 /arch
parent2d4e6dc628b43fbbbc9219e233ec3ee0afb707e3 (diff)
downloadop-kernel-dev-8cc7a2b9f75355f60922db4adf27742ba7f2f6bc.zip
op-kernel-dev-8cc7a2b9f75355f60922db4adf27742ba7f2f6bc.tar.gz
ARM: clk-imx31: Fix the keypad clock name
Fix the keypad clock name, in order to fix the following error: imx-keypad imx-keypad: failed to get keypad clock imx-keypad: probe of imx-keypad failed with error -2 Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: stable@vger.kernel.org
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/clk-imx31.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c
index 8e19e70..1253af2 100644
--- a/arch/arm/mach-imx/clk-imx31.c
+++ b/arch/arm/mach-imx/clk-imx31.c
@@ -130,7 +130,7 @@ int __init mx31_clocks_init(unsigned long fref)
clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0");
clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core");
clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");
- clk_register_clkdev(clk[kpp_gate], "kpp", NULL);
+ clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad");
clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.0");
clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.0");
clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0");
OpenPOWER on IntegriCloud