Merge tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into...

[linux-2.6-block.git] / arch / arm / mach-imx / clk-imx6q.c

diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 7b4751dbe749ed91e1bf2c1f6f667164b42a3a5b..17dc66a085a51667ab163d63ecba967ce41b139e 100644 (file)
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -151,7 +151,8 @@ enum mx6q_clks {
        gpmi_bch_apb, gpmi_bch, gpmi_io, gpmi_apb, sata, sdma, spba, ssi1,
        ssi2, ssi3, uart_ipg, uart_serial, usboh3, usdhc1, usdhc2, usdhc3,
        usdhc4, vdo_axi, vpu_axi, cko1, pll1_sys, pll2_bus, pll3_usb_otg,
-       pll4_audio, pll5_video, pll6_mlb, pll7_usb_host, pll8_enet, clk_max
+       pll4_audio, pll5_video, pll6_mlb, pll7_usb_host, pll8_enet, ssi1_ipg,
+       ssi2_ipg, ssi3_ipg, clk_max
 };
 
 static struct clk *clk[clk_max];
@@ -366,9 +367,9 @@ int __init mx6q_clocks_init(void)
        clk[sata]         = imx_clk_gate2("sata",          "ipg",               base + 0x7c, 4);
        clk[sdma]         = imx_clk_gate2("sdma",          "ahb",               base + 0x7c, 6);
        clk[spba]         = imx_clk_gate2("spba",          "ipg",               base + 0x7c, 12);
-       clk[ssi1]         = imx_clk_gate2("ssi1",          "ssi1_podf",         base + 0x7c, 18);
-       clk[ssi2]         = imx_clk_gate2("ssi2",          "ssi2_podf",         base + 0x7c, 20);
-       clk[ssi3]         = imx_clk_gate2("ssi3",          "ssi3_podf",         base + 0x7c, 22);
+       clk[ssi1_ipg]     = imx_clk_gate2("ssi1_ipg",      "ipg",               base + 0x7c, 18);
+       clk[ssi2_ipg]     = imx_clk_gate2("ssi2_ipg",      "ipg",               base + 0x7c, 20);
+       clk[ssi3_ipg]     = imx_clk_gate2("ssi3_ipg",      "ipg",               base + 0x7c, 22);
        clk[uart_ipg]     = imx_clk_gate2("uart_ipg",      "ipg",               base + 0x7c, 24);
        clk[uart_serial]  = imx_clk_gate2("uart_serial",   "uart_serial_podf",  base + 0x7c, 26);
        clk[usboh3]       = imx_clk_gate2("usboh3",        "ipg",               base + 0x80, 0);
@@ -391,17 +392,17 @@ int __init mx6q_clocks_init(void)
        clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
        clk_register_clkdev(clk[twd], NULL, "smp_twd");
        clk_register_clkdev(clk[usboh3], NULL, "usboh3");
-       clk_register_clkdev(clk[uart_serial], "per", "2020000.uart");
-       clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.uart");
-       clk_register_clkdev(clk[uart_serial], "per", "21e8000.uart");
-       clk_register_clkdev(clk[uart_ipg], "ipg", "21e8000.uart");
-       clk_register_clkdev(clk[uart_serial], "per", "21ec000.uart");
-       clk_register_clkdev(clk[uart_ipg], "ipg", "21ec000.uart");
-       clk_register_clkdev(clk[uart_serial], "per", "21f0000.uart");
-       clk_register_clkdev(clk[uart_ipg], "ipg", "21f0000.uart");
-       clk_register_clkdev(clk[uart_serial], "per", "21f4000.uart");
-       clk_register_clkdev(clk[uart_ipg], "ipg", "21f4000.uart");
-       clk_register_clkdev(clk[enet], NULL, "2188000.enet");
+       clk_register_clkdev(clk[uart_serial], "per", "2020000.serial");
+       clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.serial");
+       clk_register_clkdev(clk[uart_serial], "per", "21e8000.serial");
+       clk_register_clkdev(clk[uart_ipg], "ipg", "21e8000.serial");
+       clk_register_clkdev(clk[uart_serial], "per", "21ec000.serial");
+       clk_register_clkdev(clk[uart_ipg], "ipg", "21ec000.serial");
+       clk_register_clkdev(clk[uart_serial], "per", "21f0000.serial");
+       clk_register_clkdev(clk[uart_ipg], "ipg", "21f0000.serial");
+       clk_register_clkdev(clk[uart_serial], "per", "21f4000.serial");
+       clk_register_clkdev(clk[uart_ipg], "ipg", "21f4000.serial");
+       clk_register_clkdev(clk[enet], NULL, "2188000.ethernet");
        clk_register_clkdev(clk[usdhc1], NULL, "2190000.usdhc");
        clk_register_clkdev(clk[usdhc2], NULL, "2194000.usdhc");
        clk_register_clkdev(clk[usdhc3], NULL, "2198000.usdhc");
@@ -417,6 +418,10 @@ int __init mx6q_clocks_init(void)
        clk_register_clkdev(clk[sdma], NULL, "20ec000.sdma");
        clk_register_clkdev(clk[dummy], NULL, "20bc000.wdog");
        clk_register_clkdev(clk[dummy], NULL, "20c0000.wdog");
+       clk_register_clkdev(clk[ssi1_ipg], NULL, "2028000.ssi");
+       clk_register_clkdev(clk[cko1_sel], "cko1_sel", NULL);
+       clk_register_clkdev(clk[ahb], "ahb", NULL);
+       clk_register_clkdev(clk[cko1], "cko1", NULL);
 
        for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
                clk_prepare_enable(clk[clks_init_on[i]]);