Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / clk / renesas / r7s9210-cpg-mssr.c

diff --git a/drivers/clk/renesas/r7s9210-cpg-mssr.c b/drivers/clk/renesas/r7s9210-cpg-mssr.c
index 5135f13ec62887ddc5806af4348cc4a7e4cdd7a1..57c49fe8829567e1909dfa10cc63c63cacfacb1e 100644 (file)
--- a/drivers/clk/renesas/r7s9210-cpg-mssr.c
+++ b/drivers/clk/renesas/r7s9210-cpg-mssr.c
@@ -87,6 +87,8 @@ static const struct mssr_mod_clk r7s9210_mod_clks[] __initconst = {
        DEF_MOD_STB("scif1",     46,    R7S9210_CLK_P1C),
        DEF_MOD_STB("scif0",     47,    R7S9210_CLK_P1C),
 
+       DEF_MOD_STB("usb1",      60,    R7S9210_CLK_B),
+       DEF_MOD_STB("usb0",      61,    R7S9210_CLK_B),
        DEF_MOD_STB("ether1",    64,    R7S9210_CLK_B),
        DEF_MOD_STB("ether0",    65,    R7S9210_CLK_B),
 
@@ -98,6 +100,11 @@ static const struct mssr_mod_clk r7s9210_mod_clks[] __initconst = {
        DEF_MOD_STB("spi2",      95,    R7S9210_CLK_P1),
        DEF_MOD_STB("spi1",      96,    R7S9210_CLK_P1),
        DEF_MOD_STB("spi0",      97,    R7S9210_CLK_P1),
+
+       DEF_MOD_STB("sdhi11",   100,    R7S9210_CLK_B),
+       DEF_MOD_STB("sdhi10",   101,    R7S9210_CLK_B),
+       DEF_MOD_STB("sdhi01",   102,    R7S9210_CLK_B),
+       DEF_MOD_STB("sdhi00",   103,    R7S9210_CLK_B),
 };
 
 /* The clock dividers in the table vary based on DT and register settings */
@@ -148,7 +155,7 @@ static void __init r7s9210_update_clk_table(struct clk *extal_clk,
        }
 }
 
-struct clk * __init rza2_cpg_clk_register(struct device *dev,
+static struct clk * __init rza2_cpg_clk_register(struct device *dev,
        const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
        struct clk **clks, void __iomem *base,
        struct raw_notifier_head *notifiers)