Merge branch 'clk-renesas' into clk-next

diff --git a/drivers/clk/shmobile/r8a7795-cpg-mssr.c b/drivers/clk/shmobile/r8a7795-cpg-mssr.c
index 57c413635d1af1359bb3158b816ad1b71d9ebdf3..13e994772dfd0cf20fa0a081d65fbebf309bde69 100644 (file)
--- a/drivers/clk/shmobile/r8a7795-cpg-mssr.c
+++ b/drivers/clk/shmobile/r8a7795-cpg-mssr.c
@@ -150,6 +150,7 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
        DEF_MOD("hdmi1",                 728,   R8A7795_CLK_HDMI),
        DEF_MOD("hdmi0",                 729,   R8A7795_CLK_HDMI),
        DEF_MOD("etheravb",              812,   R8A7795_CLK_S3D2),
+       DEF_MOD("sata0",                 815,   R8A7795_CLK_S3D2),
        DEF_MOD("gpio7",                 905,   R8A7795_CLK_CP),
        DEF_MOD("gpio6",                 906,   R8A7795_CLK_CP),
        DEF_MOD("gpio5",                 907,   R8A7795_CLK_CP),