These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / clk / berlin / bg2.c

diff --git a/kernel/drivers/clk/berlin/bg2.c b/kernel/drivers/clk/berlin/bg2.c
index 515fb13..23e0e3b 100644 (file)
--- a/kernel/drivers/clk/berlin/bg2.c
+++ b/kernel/drivers/clk/berlin/bg2.c
@@ -490,8 +490,8 @@ static const struct berlin2_gate_data bg2_gates[] __initconst = {
        { "usb0",       "perif",        11 },
        { "usb1",       "perif",        12 },
        { "pbridge",    "perif",        13, CLK_IGNORE_UNUSED },
-       { "sdio0",      "perif",        14, CLK_IGNORE_UNUSED },
-       { "sdio1",      "perif",        15, CLK_IGNORE_UNUSED },
+       { "sdio0",      "perif",        14 },
+       { "sdio1",      "perif",        15 },
        { "nfc",        "perif",        17 },
        { "smemc",      "perif",        19 },
        { "audiohd",    "audiohd_pll",  26 },
@@ -502,12 +502,13 @@ static const struct berlin2_gate_data bg2_gates[] __initconst = {
 
 static void __init berlin2_clock_setup(struct device_node *np)
 {
+       struct device_node *parent_np = of_get_parent(np);
        const char *parent_names[9];
        struct clk *clk;
        u8 avpll_flags = 0;
        int n;
 
-       gbase = of_iomap(np, 0);
+       gbase = of_iomap(parent_np, 0);
        if (!gbase)
                return;
 
@@ -685,7 +686,5 @@ static void __init berlin2_clock_setup(struct device_node *np)
 bg2_fail:
        iounmap(gbase);
 }
-CLK_OF_DECLARE(berlin2_clock, "marvell,berlin2-chip-ctrl",
-              berlin2_clock_setup);
-CLK_OF_DECLARE(berlin2cd_clock, "marvell,berlin2cd-chip-ctrl",
+CLK_OF_DECLARE(berlin2_clk, "marvell,berlin2-clk",
               berlin2_clock_setup);