summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2014-06-25 14:41:34 +0200
committerShawn Guo <shawn.guo@freescale.com>2014-07-18 16:11:32 +0800
commit988eb354d4de9ca1f1c3faa491d5e67f5513484a (patch)
tree867f5453ff758b537990e3a89bc6dceaf3b01518 /arch/arm/mach-imx
parent35bcaf00de20911dd58ed2ea9848aa7e1d969394 (diff)
downloadtalos-obmc-linux-988eb354d4de9ca1f1c3faa491d5e67f5513484a.tar.gz
talos-obmc-linux-988eb354d4de9ca1f1c3faa491d5e67f5513484a.zip
ARM i.MX25 clk: Fix gpt timer clock.
The gpt0 timer clock has been wrong since: 6bbaec5 ARM i.MX25: implement clocks using common clock framework Signed-off-by: Denis Carikli <denis@eukrea.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/clk-imx25.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx25.c b/arch/arm/mach-imx/clk-imx25.c
index 887b5080afdb..e759a6da9407 100644
--- a/arch/arm/mach-imx/clk-imx25.c
+++ b/arch/arm/mach-imx/clk-imx25.c
@@ -242,7 +242,7 @@ int __init mx25_clocks_init(void)
{
__mx25_clocks_init(24000000);
- clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0");
+ clk_register_clkdev(clk[gpt1_ipg], "ipg", "imx-gpt.0");
clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
/* i.mx25 has the i.mx21 type uart */
clk_register_clkdev(clk[uart1_ipg], "ipg", "imx21-uart.0");
OpenPOWER on IntegriCloud