diff options
| author | Anton Arapov <anton@redhat.com> | 2012-09-12 09:18:33 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-09-12 09:19:26 +0200 |
| commit | 985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2 (patch) | |
| tree | eb9091ebd60e14eea65a9e6b5140f98d88e8a590 /arch/arm/mach-imx | |
| parent | 1d44b6f3fcf6058fb7c960b7558766967e8028f7 (diff) | |
| download | kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.tar.gz kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.tar.xz kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.zip | |
fedora kernel: 021ce7bee3cfdcbf16da1256b2c9f40f7e9bbd9ev3.5.3-1
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx31.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx51-imx53.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c index c9a06d800f8..4bcb3a184f9 100644 --- a/arch/arm/mach-imx/clk-imx31.c +++ b/arch/arm/mach-imx/clk-imx31.c @@ -129,7 +129,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"); diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index a2200c77bf7..ae3d802b71e 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c @@ -293,6 +293,7 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, clk_prepare_enable(clk[aips_tz2]); /* fec */ clk_prepare_enable(clk[spba]); clk_prepare_enable(clk[emi_fast_gate]); /* fec */ + clk_prepare_enable(clk[emi_slow_gate]); /* eim */ clk_prepare_enable(clk[tmax1]); clk_prepare_enable(clk[tmax2]); /* esdhc2, fec */ clk_prepare_enable(clk[tmax3]); /* esdhc1, esdhc4 */ |