diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-01-01 02:17:39 +0300 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-01-01 02:17:39 +0300 |
| commit | 9e256c722fa4ac42bef9eb6e43bb7fe3436cca04 (patch) | |
| tree | 69c5a6abddb1597db3e417bab9a195a26dce994e /drivers/clk | |
| parent | 82d0f8bc4b5765027fa3eb07cc32916b7b229ee0 (diff) | |
| parent | c1c5864d9490278715dda77db402e13f4428ffda (diff) | |
| download | linux-9e256c722fa4ac42bef9eb6e43bb7fe3436cca04.tar.xz | |
Merge branch 'clk-renesas' into clk-next
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/shmobile/r8a7795-cpg-mssr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/shmobile/r8a7795-cpg-mssr.c b/drivers/clk/shmobile/r8a7795-cpg-mssr.c index 57c413635d1a..13e994772dfd 100644 --- 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), |