Merge tag 'arm-imx-clk-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 21:45:33 +0000 (22:45 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 21:45:33 +0000 (22:45 +0100)
ARM: i.MX: clock fixes

- fix wrong timer clock on i.MX25 leading to strange timing inconsistencies
- fix SPI clocks for i.MX27

* tag 'arm-imx-clk-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: i.MX25: clk: parent per5_clk to AHB clock
  ARM: imx27: clk-imx27: SPI: Rename IPG clock and add PER clock

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-imx/clk-imx25.c
arch/arm/mach-imx/clk-imx27.c

index 2c570cdaae7b1f9152f6cb1e0dd122882cfac028..69858c78f40d07ff5a4ef7a2ae724b09813a19f5 100644 (file)
@@ -224,6 +224,9 @@ static int __init __mx25_clocks_init(unsigned long osc_rate)
 
        clk_prepare_enable(clk[emi_ahb]);
 
+       /* Clock source for gpt must be derived from AHB */
+       clk_set_parent(clk[per5_sel], clk[ahb]);
+
        clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0");
        clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
 
index 1ffe3b534e51562aca68b587c383bb3df00b38a8..e30369a58e4e81d244f9246cd83f63031b2fda5d 100644 (file)
@@ -228,9 +228,12 @@ int __init mx27_clocks_init(unsigned long fref)
        clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.1");
        clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.2");
        clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.2");
-       clk_register_clkdev(clk[cspi1_ipg_gate], NULL, "imx27-cspi.0");
-       clk_register_clkdev(clk[cspi2_ipg_gate], NULL, "imx27-cspi.1");
-       clk_register_clkdev(clk[cspi3_ipg_gate], NULL, "imx27-cspi.2");
+       clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.0");
+       clk_register_clkdev(clk[cspi1_ipg_gate], "ipg", "imx27-cspi.0");
+       clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.1");
+       clk_register_clkdev(clk[cspi2_ipg_gate], "ipg", "imx27-cspi.1");
+       clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.2");
+       clk_register_clkdev(clk[cspi3_ipg_gate], "ipg", "imx27-cspi.2");
        clk_register_clkdev(clk[per3_gate], "per", "imx21-fb.0");
        clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0");
        clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0");