summaryrefslogtreecommitdiffstats
path: root/drivers/clk/shmobile/clk-rcar-gen2.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-08-18 13:30:18 -0700
committerOlof Johansson <olof@lixom.net>2015-08-18 13:30:18 -0700
commita005bc6f69d79574840bdf04350671fb3b2dd8ae (patch)
tree191f1be393de09a0745f12cec9a8c0ca76ac9a8b /drivers/clk/shmobile/clk-rcar-gen2.c
parent0bf413558eb5668fe92b1a1931dc26b0df5908ae (diff)
parentf04b486d34ac6bab2aaa3988ee098b2bad3950de (diff)
downloadtalos-op-linux-a005bc6f69d79574840bdf04350671fb3b2dd8ae.tar.gz
talos-op-linux-a005bc6f69d79574840bdf04350671fb3b2dd8ae.zip
Merge tag 'renesas-clk-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
Renesas ARM Based SoC CPG/MSTP Clock Driver Updates for v4.3 * Add Clock Domain support to the Clock Pulse Generator (CPG) Module Stop (MSTP) Clocks driver using the generic PM Domain. * tag 'renesas-clk-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: clk: shmobile: rz: Add CPG/MSTP Clock Domain support clk: shmobile: rcar-gen2: Add CPG/MSTP Clock Domain support clk: shmobile: r8a7779: Add CPG/MSTP Clock Domain support clk: shmobile: r8a7778: Add CPG/MSTP Clock Domain support clk: shmobile: Add CPG/MSTP Clock Domain support Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk/shmobile/clk-rcar-gen2.c')
-rw-r--r--drivers/clk/shmobile/clk-rcar-gen2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
index acfb6d7dbd6b..f2c457f494eb 100644
--- a/drivers/clk/shmobile/clk-rcar-gen2.c
+++ b/drivers/clk/shmobile/clk-rcar-gen2.c
@@ -415,6 +415,8 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np)
}
of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data);
+
+ cpg_mstp_add_clk_domain(np);
}
CLK_OF_DECLARE(rcar_gen2_cpg_clks, "renesas,rcar-gen2-cpg-clocks",
rcar_gen2_cpg_clocks_init);
OpenPOWER on IntegriCloud