Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / clk / samsung / clk-exynos5250.c

diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c
index 61068cda2ab3837a76a5e86ed447e034c863c6fe..5c97e75924a8a87b4aebfa5e7ddfde1f31231fff 100644 (file)
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@ -275,10 +275,10 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = {
        DIV(none, "div_pcm0", "sclk_audio0", DIV_MAU, 4, 8),
        DIV(none, "div_sata", "mout_sata", DIV_FSYS0, 20, 4),
        DIV(none, "div_usb3", "mout_usb3", DIV_FSYS0, 24, 4),
-       DIV(none, "div_mmc0", "mout_mmc0", DIV_FSYS1, 8, 8),
-       DIV(none, "div_mmc1", "mout_mmc1", DIV_FSYS1, 24, 8),
-       DIV(none, "div_mmc2", "mout_mmc2", DIV_FSYS2, 8, 8),
-       DIV(none, "div_mmc3", "mout_mmc3", DIV_FSYS2, 24, 8),
+       DIV(none, "div_mmc0", "mout_mmc0", DIV_FSYS1, 0, 4),
+       DIV(none, "div_mmc1", "mout_mmc1", DIV_FSYS1, 16, 4),
+       DIV(none, "div_mmc2", "mout_mmc2", DIV_FSYS2, 0, 4),
+       DIV(none, "div_mmc3", "mout_mmc3", DIV_FSYS2, 16, 4),
        DIV(none, "div_uart0", "mout_uart0", DIV_PERIC0, 0, 4),
        DIV(none, "div_uart1", "mout_uart1", DIV_PERIC0, 4, 4),
        DIV(none, "div_uart2", "mout_uart2", DIV_PERIC0, 8, 4),
@@ -420,13 +420,13 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = {
                        SRC_MASK_DISP1_0, 20, 0, 0),
        GATE(sclk_audio0, "sclk_audio0", "div_audio0",
                        SRC_MASK_MAU, 0, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc0, "sclk_mmc0", "div_mmc0",
+       GATE(sclk_mmc0, "sclk_mmc0", "div_mmc_pre0",
                        SRC_MASK_FSYS, 0, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc1, "sclk_mmc1", "div_mmc1",
+       GATE(sclk_mmc1, "sclk_mmc1", "div_mmc_pre1",
                        SRC_MASK_FSYS, 4, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc2, "sclk_mmc2", "div_mmc2",
+       GATE(sclk_mmc2, "sclk_mmc2", "div_mmc_pre2",
                        SRC_MASK_FSYS, 8, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc3, "sclk_mmc3", "div_mmc3",
+       GATE(sclk_mmc3, "sclk_mmc3", "div_mmc_pre3",
                        SRC_MASK_FSYS, 12, CLK_SET_RATE_PARENT, 0),
        GATE(sclk_sata, "sclk_sata", "div_sata",
                        SRC_MASK_FSYS, 24, CLK_SET_RATE_PARENT, 0),