clk: add CLK_SET_RATE_NO_REPARENT flag

Add a CLK_SET_RATE_NO_REPARENT clock flag, which will prevent muxes
being reparented during clk_set_rate.

To avoid breaking existing platforms, all callers of clk_register_mux()
are adjusted to pass the new flag. Platform maintainers are encouraged
to remove the flag if they wish to allow mux reparenting on set_rate.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Chao Xie <xiechao.mail@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Emilio López" <emilio@elopez.com.ar>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Prashant Gaikwad <pgaikwad@nvidia.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Peter De Schrijver <pdeschrijver@nvidia.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Andrew Chew <achew@nvidia.com>
Cc: Doug Anderson <dianders@chromium.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Paul Walmsley <pwalmsley@nvidia.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: spear-devel@list.st.com
Cc: linux-tegra@vger.kernel.org
Tested-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Acked-by: Stephen Warren <swarren@nvidia.com> [tegra]
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> [sunxi]
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com> [Zynq]
Signed-off-by: Mike Turquette <mturquette@linaro.org>

1 files changed, 93 insertions, 86 deletions

diff --git a/drivers/clk/spear/spear1310_clock.c b/drivers/clk/spear/spear1310_clock.c
index aedbbe12f321..65894f7687ed 100644
--- a/drivers/clk/spear/spear1310_clock.c
+++ b/drivers/clk/spear/spear1310_clock.c
@@ -416,9 +416,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         /* clock derived from 24 or 25 MHz osc clk */
         /* vco-pll */
         clk = clk_register_mux(NULL, "vco1_mclk", vco_parents,
-                        ARRAY_SIZE(vco_parents), 0, SPEAR1310_PLL_CFG,
-                        SPEAR1310_PLL1_CLK_SHIFT, SPEAR1310_PLL_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(vco_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_PLL_CFG, SPEAR1310_PLL1_CLK_SHIFT,
+                        SPEAR1310_PLL_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "vco1_mclk", NULL);
         clk = clk_register_vco_pll("vco1_clk", "pll1_clk", NULL, "vco1_mclk",
                         0, SPEAR1310_PLL1_CTR, SPEAR1310_PLL1_FRQ, pll_rtbl,
@@ -427,9 +427,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk1, "pll1_clk", NULL);
 
         clk = clk_register_mux(NULL, "vco2_mclk", vco_parents,
-                        ARRAY_SIZE(vco_parents), 0, SPEAR1310_PLL_CFG,
-                        SPEAR1310_PLL2_CLK_SHIFT, SPEAR1310_PLL_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(vco_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_PLL_CFG, SPEAR1310_PLL2_CLK_SHIFT,
+                        SPEAR1310_PLL_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "vco2_mclk", NULL);
         clk = clk_register_vco_pll("vco2_clk", "pll2_clk", NULL, "vco2_mclk",
                         0, SPEAR1310_PLL2_CTR, SPEAR1310_PLL2_FRQ, pll_rtbl,
@@ -438,9 +438,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk1, "pll2_clk", NULL);
 
         clk = clk_register_mux(NULL, "vco3_mclk", vco_parents,
-                        ARRAY_SIZE(vco_parents), 0, SPEAR1310_PLL_CFG,
-                        SPEAR1310_PLL3_CLK_SHIFT, SPEAR1310_PLL_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(vco_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_PLL_CFG, SPEAR1310_PLL3_CLK_SHIFT,
+                        SPEAR1310_PLL_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "vco3_mclk", NULL);
         clk = clk_register_vco_pll("vco3_clk", "pll3_clk", NULL, "vco3_mclk",
                         0, SPEAR1310_PLL3_CTR, SPEAR1310_PLL3_FRQ, pll_rtbl,
@@ -515,9 +515,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
 
         /* gpt clocks */
         clk = clk_register_mux(NULL, "gpt0_mclk", gpt_parents,
-                        ARRAY_SIZE(gpt_parents), 0, SPEAR1310_PERIP_CLK_CFG,
-                        SPEAR1310_GPT0_CLK_SHIFT, SPEAR1310_GPT_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(gpt_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_PERIP_CLK_CFG, SPEAR1310_GPT0_CLK_SHIFT,
+                        SPEAR1310_GPT_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "gpt0_mclk", NULL);
         clk = clk_register_gate(NULL, "gpt0_clk", "gpt0_mclk", 0,
                         SPEAR1310_PERIP1_CLK_ENB, SPEAR1310_GPT0_CLK_ENB, 0,
@@ -525,9 +525,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "gpt0");
 
         clk = clk_register_mux(NULL, "gpt1_mclk", gpt_parents,
-                        ARRAY_SIZE(gpt_parents), 0, SPEAR1310_PERIP_CLK_CFG,
-                        SPEAR1310_GPT1_CLK_SHIFT, SPEAR1310_GPT_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(gpt_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_PERIP_CLK_CFG, SPEAR1310_GPT1_CLK_SHIFT,
+                        SPEAR1310_GPT_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "gpt1_mclk", NULL);
         clk = clk_register_gate(NULL, "gpt1_clk", "gpt1_mclk", 0,
                         SPEAR1310_PERIP1_CLK_ENB, SPEAR1310_GPT1_CLK_ENB, 0,
@@ -535,9 +535,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "gpt1");
 
         clk = clk_register_mux(NULL, "gpt2_mclk", gpt_parents,
-                        ARRAY_SIZE(gpt_parents), 0, SPEAR1310_PERIP_CLK_CFG,
-                        SPEAR1310_GPT2_CLK_SHIFT, SPEAR1310_GPT_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(gpt_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_PERIP_CLK_CFG, SPEAR1310_GPT2_CLK_SHIFT,
+                        SPEAR1310_GPT_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "gpt2_mclk", NULL);
         clk = clk_register_gate(NULL, "gpt2_clk", "gpt2_mclk", 0,
                         SPEAR1310_PERIP2_CLK_ENB, SPEAR1310_GPT2_CLK_ENB, 0,
@@ -545,9 +545,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "gpt2");
 
         clk = clk_register_mux(NULL, "gpt3_mclk", gpt_parents,
-                        ARRAY_SIZE(gpt_parents), 0, SPEAR1310_PERIP_CLK_CFG,
-                        SPEAR1310_GPT3_CLK_SHIFT, SPEAR1310_GPT_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(gpt_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_PERIP_CLK_CFG, SPEAR1310_GPT3_CLK_SHIFT,
+                        SPEAR1310_GPT_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "gpt3_mclk", NULL);
         clk = clk_register_gate(NULL, "gpt3_clk", "gpt3_mclk", 0,
                         SPEAR1310_PERIP2_CLK_ENB, SPEAR1310_GPT3_CLK_ENB, 0,
@@ -562,7 +562,8 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk1, "uart_syn_gclk", NULL);
 
         clk = clk_register_mux(NULL, "uart0_mclk", uart0_parents,
-                        ARRAY_SIZE(uart0_parents), CLK_SET_RATE_PARENT,
+                        ARRAY_SIZE(uart0_parents),
+                        CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                         SPEAR1310_PERIP_CLK_CFG, SPEAR1310_UART_CLK_SHIFT,
                         SPEAR1310_UART_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "uart0_mclk", NULL);
@@ -602,7 +603,8 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk1, "c3_syn_gclk", NULL);
 
         clk = clk_register_mux(NULL, "c3_mclk", c3_parents,
-                        ARRAY_SIZE(c3_parents), CLK_SET_RATE_PARENT,
+                        ARRAY_SIZE(c3_parents),
+                        CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                         SPEAR1310_PERIP_CLK_CFG, SPEAR1310_C3_CLK_SHIFT,
                         SPEAR1310_C3_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "c3_mclk", NULL);
@@ -614,8 +616,8 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
 
         /* gmac */
         clk = clk_register_mux(NULL, "phy_input_mclk", gmac_phy_input_parents,
-                        ARRAY_SIZE(gmac_phy_input_parents), 0,
-                        SPEAR1310_GMAC_CLK_CFG,
+                        ARRAY_SIZE(gmac_phy_input_parents),
+                        CLK_SET_RATE_NO_REPARENT, SPEAR1310_GMAC_CLK_CFG,
                         SPEAR1310_GMAC_PHY_INPUT_CLK_SHIFT,
                         SPEAR1310_GMAC_PHY_INPUT_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "phy_input_mclk", NULL);
@@ -627,15 +629,16 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk1, "phy_syn_gclk", NULL);
 
         clk = clk_register_mux(NULL, "phy_mclk", gmac_phy_parents,
-                        ARRAY_SIZE(gmac_phy_parents), 0,
+                        ARRAY_SIZE(gmac_phy_parents), CLK_SET_RATE_NO_REPARENT,
                         SPEAR1310_PERIP_CLK_CFG, SPEAR1310_GMAC_PHY_CLK_SHIFT,
                         SPEAR1310_GMAC_PHY_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "stmmacphy.0", NULL);
 
         /* clcd */
         clk = clk_register_mux(NULL, "clcd_syn_mclk", clcd_synth_parents,
-                        ARRAY_SIZE(clcd_synth_parents), 0,
-                        SPEAR1310_CLCD_CLK_SYNT, SPEAR1310_CLCD_SYNT_CLK_SHIFT,
+                        ARRAY_SIZE(clcd_synth_parents),
+                        CLK_SET_RATE_NO_REPARENT, SPEAR1310_CLCD_CLK_SYNT,
+                        SPEAR1310_CLCD_SYNT_CLK_SHIFT,
                         SPEAR1310_CLCD_SYNT_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "clcd_syn_mclk", NULL);
 
@@ -645,7 +648,8 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, "clcd_syn_clk", NULL);
 
         clk = clk_register_mux(NULL, "clcd_pixel_mclk", clcd_pixel_parents,
-                        ARRAY_SIZE(clcd_pixel_parents), CLK_SET_RATE_PARENT,
+                        ARRAY_SIZE(clcd_pixel_parents),
+                        CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                         SPEAR1310_PERIP_CLK_CFG, SPEAR1310_CLCD_CLK_SHIFT,
                         SPEAR1310_CLCD_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "clcd_pixel_mclk", NULL);
@@ -657,9 +661,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
 
         /* i2s */
         clk = clk_register_mux(NULL, "i2s_src_mclk", i2s_src_parents,
-                        ARRAY_SIZE(i2s_src_parents), 0, SPEAR1310_I2S_CLK_CFG,
-                        SPEAR1310_I2S_SRC_CLK_SHIFT, SPEAR1310_I2S_SRC_CLK_MASK,
-                        0, &_lock);
+                        ARRAY_SIZE(i2s_src_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_I2S_CLK_CFG, SPEAR1310_I2S_SRC_CLK_SHIFT,
+                        SPEAR1310_I2S_SRC_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2s_src_mclk", NULL);
 
         clk = clk_register_aux("i2s_prs1_clk", NULL, "i2s_src_mclk", 0,
@@ -668,7 +672,8 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, "i2s_prs1_clk", NULL);
 
         clk = clk_register_mux(NULL, "i2s_ref_mclk", i2s_ref_parents,
-                        ARRAY_SIZE(i2s_ref_parents), CLK_SET_RATE_PARENT,
+                        ARRAY_SIZE(i2s_ref_parents),
+                        CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                         SPEAR1310_I2S_CLK_CFG, SPEAR1310_I2S_REF_SHIFT,
                         SPEAR1310_I2S_REF_SEL_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2s_ref_mclk", NULL);
@@ -806,13 +811,15 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
 
         /* RAS clks */
         clk = clk_register_mux(NULL, "gen_syn0_1_mclk", gen_synth0_1_parents,
-                        ARRAY_SIZE(gen_synth0_1_parents), 0, SPEAR1310_PLL_CFG,
+                        ARRAY_SIZE(gen_synth0_1_parents),
+                        CLK_SET_RATE_NO_REPARENT, SPEAR1310_PLL_CFG,
                         SPEAR1310_RAS_SYNT0_1_CLK_SHIFT,
                         SPEAR1310_RAS_SYNT_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "gen_syn0_1_clk", NULL);
 
         clk = clk_register_mux(NULL, "gen_syn2_3_mclk", gen_synth2_3_parents,
-                        ARRAY_SIZE(gen_synth2_3_parents), 0, SPEAR1310_PLL_CFG,
+                        ARRAY_SIZE(gen_synth2_3_parents),
+                        CLK_SET_RATE_NO_REPARENT, SPEAR1310_PLL_CFG,
                         SPEAR1310_RAS_SYNT2_3_CLK_SHIFT,
                         SPEAR1310_RAS_SYNT_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "gen_syn2_3_clk", NULL);
@@ -929,8 +936,8 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
 
         clk = clk_register_mux(NULL, "smii_rgmii_phy_mclk",
                         smii_rgmii_phy_parents,
-                        ARRAY_SIZE(smii_rgmii_phy_parents), 0,
-                        SPEAR1310_RAS_CTRL_REG1,
+                        ARRAY_SIZE(smii_rgmii_phy_parents),
+                        CLK_SET_RATE_NO_REPARENT, SPEAR1310_RAS_CTRL_REG1,
                         SPEAR1310_SMII_RGMII_PHY_CLK_SHIFT,
                         SPEAR1310_PHY_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "stmmacphy.1", NULL);
@@ -938,15 +945,15 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, "stmmacphy.4", NULL);
 
         clk = clk_register_mux(NULL, "rmii_phy_mclk", rmii_phy_parents,
-                        ARRAY_SIZE(rmii_phy_parents), 0,
+                        ARRAY_SIZE(rmii_phy_parents), CLK_SET_RATE_NO_REPARENT,
                         SPEAR1310_RAS_CTRL_REG1, SPEAR1310_RMII_PHY_CLK_SHIFT,
                         SPEAR1310_PHY_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "stmmacphy.3", NULL);
 
         clk = clk_register_mux(NULL, "uart1_mclk", uart_parents,
-                        ARRAY_SIZE(uart_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_UART1_CLK_SHIFT, SPEAR1310_RAS_UART_CLK_MASK,
-                        0, &_lock);
+                        ARRAY_SIZE(uart_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_UART1_CLK_SHIFT,
+                        SPEAR1310_RAS_UART_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "uart1_mclk", NULL);
 
         clk = clk_register_gate(NULL, "uart1_clk", "uart1_mclk", 0,
@@ -955,9 +962,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5c800000.serial");
 
         clk = clk_register_mux(NULL, "uart2_mclk", uart_parents,
-                        ARRAY_SIZE(uart_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_UART2_CLK_SHIFT, SPEAR1310_RAS_UART_CLK_MASK,
-                        0, &_lock);
+                        ARRAY_SIZE(uart_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_UART2_CLK_SHIFT,
+                        SPEAR1310_RAS_UART_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "uart2_mclk", NULL);
 
         clk = clk_register_gate(NULL, "uart2_clk", "uart2_mclk", 0,
@@ -966,9 +973,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5c900000.serial");
 
         clk = clk_register_mux(NULL, "uart3_mclk", uart_parents,
-                        ARRAY_SIZE(uart_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_UART3_CLK_SHIFT, SPEAR1310_RAS_UART_CLK_MASK,
-                        0, &_lock);
+                        ARRAY_SIZE(uart_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_UART3_CLK_SHIFT,
+                        SPEAR1310_RAS_UART_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "uart3_mclk", NULL);
 
         clk = clk_register_gate(NULL, "uart3_clk", "uart3_mclk", 0,
@@ -977,9 +984,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5ca00000.serial");
 
         clk = clk_register_mux(NULL, "uart4_mclk", uart_parents,
-                        ARRAY_SIZE(uart_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_UART4_CLK_SHIFT, SPEAR1310_RAS_UART_CLK_MASK,
-                        0, &_lock);
+                        ARRAY_SIZE(uart_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_UART4_CLK_SHIFT,
+                        SPEAR1310_RAS_UART_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "uart4_mclk", NULL);
 
         clk = clk_register_gate(NULL, "uart4_clk", "uart4_mclk", 0,
@@ -988,9 +995,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5cb00000.serial");
 
         clk = clk_register_mux(NULL, "uart5_mclk", uart_parents,
-                        ARRAY_SIZE(uart_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_UART5_CLK_SHIFT, SPEAR1310_RAS_UART_CLK_MASK,
-                        0, &_lock);
+                        ARRAY_SIZE(uart_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_UART5_CLK_SHIFT,
+                        SPEAR1310_RAS_UART_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "uart5_mclk", NULL);
 
         clk = clk_register_gate(NULL, "uart5_clk", "uart5_mclk", 0,
@@ -999,9 +1006,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5cc00000.serial");
 
         clk = clk_register_mux(NULL, "i2c1_mclk", i2c_parents,
-                        ARRAY_SIZE(i2c_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_I2C1_CLK_SHIFT, SPEAR1310_I2C_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(i2c_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_I2C1_CLK_SHIFT,
+                        SPEAR1310_I2C_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2c1_mclk", NULL);
 
         clk = clk_register_gate(NULL, "i2c1_clk", "i2c1_mclk", 0,
@@ -1010,9 +1017,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5cd00000.i2c");
 
         clk = clk_register_mux(NULL, "i2c2_mclk", i2c_parents,
-                        ARRAY_SIZE(i2c_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_I2C2_CLK_SHIFT, SPEAR1310_I2C_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(i2c_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_I2C2_CLK_SHIFT,
+                        SPEAR1310_I2C_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2c2_mclk", NULL);
 
         clk = clk_register_gate(NULL, "i2c2_clk", "i2c2_mclk", 0,
@@ -1021,9 +1028,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5ce00000.i2c");
 
         clk = clk_register_mux(NULL, "i2c3_mclk", i2c_parents,
-                        ARRAY_SIZE(i2c_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_I2C3_CLK_SHIFT, SPEAR1310_I2C_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(i2c_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_I2C3_CLK_SHIFT,
+                        SPEAR1310_I2C_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2c3_mclk", NULL);
 
         clk = clk_register_gate(NULL, "i2c3_clk", "i2c3_mclk", 0,
@@ -1032,9 +1039,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5cf00000.i2c");
 
         clk = clk_register_mux(NULL, "i2c4_mclk", i2c_parents,
-                        ARRAY_SIZE(i2c_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_I2C4_CLK_SHIFT, SPEAR1310_I2C_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(i2c_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_I2C4_CLK_SHIFT,
+                        SPEAR1310_I2C_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2c4_mclk", NULL);
 
         clk = clk_register_gate(NULL, "i2c4_clk", "i2c4_mclk", 0,
@@ -1043,9 +1050,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5d000000.i2c");
 
         clk = clk_register_mux(NULL, "i2c5_mclk", i2c_parents,
-                        ARRAY_SIZE(i2c_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_I2C5_CLK_SHIFT, SPEAR1310_I2C_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(i2c_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_I2C5_CLK_SHIFT,
+                        SPEAR1310_I2C_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2c5_mclk", NULL);
 
         clk = clk_register_gate(NULL, "i2c5_clk", "i2c5_mclk", 0,
@@ -1054,9 +1061,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5d100000.i2c");
 
         clk = clk_register_mux(NULL, "i2c6_mclk", i2c_parents,
-                        ARRAY_SIZE(i2c_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_I2C6_CLK_SHIFT, SPEAR1310_I2C_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(i2c_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_I2C6_CLK_SHIFT,
+                        SPEAR1310_I2C_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2c6_mclk", NULL);
 
         clk = clk_register_gate(NULL, "i2c6_clk", "i2c6_mclk", 0,
@@ -1065,9 +1072,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5d200000.i2c");
 
         clk = clk_register_mux(NULL, "i2c7_mclk", i2c_parents,
-                        ARRAY_SIZE(i2c_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_I2C7_CLK_SHIFT, SPEAR1310_I2C_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(i2c_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_I2C7_CLK_SHIFT,
+                        SPEAR1310_I2C_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "i2c7_mclk", NULL);
 
         clk = clk_register_gate(NULL, "i2c7_clk", "i2c7_mclk", 0,
@@ -1076,9 +1083,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5d300000.i2c");
 
         clk = clk_register_mux(NULL, "ssp1_mclk", ssp1_parents,
-                        ARRAY_SIZE(ssp1_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_SSP1_CLK_SHIFT, SPEAR1310_SSP1_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(ssp1_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_SSP1_CLK_SHIFT,
+                        SPEAR1310_SSP1_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "ssp1_mclk", NULL);
 
         clk = clk_register_gate(NULL, "ssp1_clk", "ssp1_mclk", 0,
@@ -1087,9 +1094,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "5d400000.spi");
 
         clk = clk_register_mux(NULL, "pci_mclk", pci_parents,
-                        ARRAY_SIZE(pci_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_PCI_CLK_SHIFT, SPEAR1310_PCI_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(pci_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_PCI_CLK_SHIFT,
+                        SPEAR1310_PCI_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "pci_mclk", NULL);
 
         clk = clk_register_gate(NULL, "pci_clk", "pci_mclk", 0,
@@ -1098,9 +1105,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "pci");
 
         clk = clk_register_mux(NULL, "tdm1_mclk", tdm_parents,
-                        ARRAY_SIZE(tdm_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_TDM1_CLK_SHIFT, SPEAR1310_TDM_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(tdm_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_TDM1_CLK_SHIFT,
+                        SPEAR1310_TDM_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "tdm1_mclk", NULL);
 
         clk = clk_register_gate(NULL, "tdm1_clk", "tdm1_mclk", 0,
@@ -1109,9 +1116,9 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base)
         clk_register_clkdev(clk, NULL, "tdm_hdlc.0");
 
         clk = clk_register_mux(NULL, "tdm2_mclk", tdm_parents,
-                        ARRAY_SIZE(tdm_parents), 0, SPEAR1310_RAS_CTRL_REG0,
-                        SPEAR1310_TDM2_CLK_SHIFT, SPEAR1310_TDM_CLK_MASK, 0,
-                        &_lock);
+                        ARRAY_SIZE(tdm_parents), CLK_SET_RATE_NO_REPARENT,
+                        SPEAR1310_RAS_CTRL_REG0, SPEAR1310_TDM2_CLK_SHIFT,
+                        SPEAR1310_TDM_CLK_MASK, 0, &_lock);
         clk_register_clkdev(clk, "tdm2_mclk", NULL);
 
         clk = clk_register_gate(NULL, "tdm2_clk", "tdm2_mclk", 0,