diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-02 20:15:13 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-02 20:22:23 +0200 |
commit | 9f30a04d768f64280dc0c40b730746e82f298d88 (patch) | |
tree | e112853eb73627ed7b9a2ef8e4feab6685a0200e /drivers/clk/shmobile/clk-rcar-gen2.c | |
parent | clk: samsung: fix cpu clock's flags checking (diff) | |
parent | clk: ti: dflt: fix enable_reg validity check (diff) | |
download | linux-9f30a04d768f64280dc0c40b730746e82f298d88.tar.xz linux-9f30a04d768f64280dc0c40b730746e82f298d88.zip |
Merge branch 'for-4.3-rc/ti-clk-fixes' of https://github.com/t-kristo/linux-pm into clk-fixes
Pull fixes from Tero Kristo:
"A few TI clock driver fixes to pull against 4.3-rc"
* 'for-4.3-rc/ti-clk-fixes' of https://github.com/t-kristo/linux-pm: (3 commits)
clk: ti: dflt: fix enable_reg validity check
clk: ti: fix dual-registration of uart4_ick
clk: ti: clk-7xx: Remove hardwired ABE clock configuration
Diffstat (limited to 'drivers/clk/shmobile/clk-rcar-gen2.c')
-rw-r--r-- | drivers/clk/shmobile/clk-rcar-gen2.c | 2 |
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 9233ebf8cc49..745496f7ee9c 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); |