Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical

ARM: i.MX: Fix SSI clock associations for i.MX25/i.MX35

* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: clk-imx35: Fix SSI clock registration
  ARM: clk-imx25: Fix SSI clock registration
Olof Johansson 12 years ago
parent
f78a88d497 4854005861
commit
03e588e9bd
2 changed files with 4 additions and 8 deletions
Split View Show Diff Stats
  1. 2 4
      arch/arm/mach-imx/clk-imx25.c
  2. 2 4
      arch/arm/mach-imx/clk-imx35.c

+ 2 - 4
arch/arm/mach-imx/clk-imx25.c
View File 

@@ -222,10 +222,8 @@ int __init mx25_clocks_init(void)
 
 	clk_register_clkdev(clk[lcdc_ipg], "ipg", "imx-fb.0");
 
 	clk_register_clkdev(clk[lcdc_ahb], "ahb", "imx-fb.0");
 
 	clk_register_clkdev(clk[wdt_ipg], NULL, "imx2-wdt.0");
 
-	clk_register_clkdev(clk[ssi1_ipg_per], "per", "imx-ssi.0");
 
-	clk_register_clkdev(clk[ssi1_ipg], "ipg", "imx-ssi.0");
 
-	clk_register_clkdev(clk[ssi2_ipg_per], "per", "imx-ssi.1");
 
-	clk_register_clkdev(clk[ssi2_ipg], "ipg", "imx-ssi.1");
 
+	clk_register_clkdev(clk[ssi1_ipg], NULL, "imx-ssi.0");
 
+	clk_register_clkdev(clk[ssi2_ipg], NULL, "imx-ssi.1");
 
 	clk_register_clkdev(clk[esdhc1_ipg_per], "per", "sdhci-esdhc-imx25.0");
 
 	clk_register_clkdev(clk[esdhc1_ipg], "ipg", "sdhci-esdhc-imx25.0");
 
 	clk_register_clkdev(clk[esdhc1_ahb], "ahb", "sdhci-esdhc-imx25.0");

+ 2 - 4
arch/arm/mach-imx/clk-imx35.c
View File 

@@ -230,10 +230,8 @@ int __init mx35_clocks_init()
 
 	clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");
 
 	clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1");
 
 	clk_register_clkdev(clk[sdma_gate], NULL, "imx35-sdma");
 
-	clk_register_clkdev(clk[ipg], "ipg", "imx-ssi.0");
 
-	clk_register_clkdev(clk[ssi1_div_post], "per", "imx-ssi.0");
 
-	clk_register_clkdev(clk[ipg], "ipg", "imx-ssi.1");
 
-	clk_register_clkdev(clk[ssi2_div_post], "per", "imx-ssi.1");
 
+	clk_register_clkdev(clk[ssi1_gate], NULL, "imx-ssi.0");
 
+	clk_register_clkdev(clk[ssi2_gate], NULL, "imx-ssi.1");
 
 	/* i.mx35 has the i.mx21 type uart */
 
 	clk_register_clkdev(clk[uart1_gate], "per", "imx21-uart.0");
 
 	clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.0");