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, 20 insertions, 11 deletions

diff --git a/drivers/clk/mmp/clk-pxa910.c b/drivers/clk/mmp/clk-pxa910.c
index 6ec05698ed38..9efc6a47535d 100644
--- a/drivers/clk/mmp/clk-pxa910.c
+++ b/drivers/clk/mmp/clk-pxa910.c
@@ -204,7 +204,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, NULL, "pxa910-pwm.3");
 
         clk = clk_register_mux(NULL, "uart0_mux", uart_parent,
-                                ARRAY_SIZE(uart_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(uart_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apbc_base + APBC_UART0, 4, 3, 0, &clk_lock);
         clk_set_parent(clk, uart_pll);
         clk_register_clkdev(clk, "uart_mux.0", NULL);
@@ -214,7 +215,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, NULL, "pxa2xx-uart.0");
 
         clk = clk_register_mux(NULL, "uart1_mux", uart_parent,
-                                ARRAY_SIZE(uart_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(uart_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apbc_base + APBC_UART1, 4, 3, 0, &clk_lock);
         clk_set_parent(clk, uart_pll);
         clk_register_clkdev(clk, "uart_mux.1", NULL);
@@ -224,7 +226,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, NULL, "pxa2xx-uart.1");
 
         clk = clk_register_mux(NULL, "uart2_mux", uart_parent,
-                                ARRAY_SIZE(uart_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(uart_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apbcp_base + APBCP_UART2, 4, 3, 0, &clk_lock);
         clk_set_parent(clk, uart_pll);
         clk_register_clkdev(clk, "uart_mux.2", NULL);
@@ -234,7 +237,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, NULL, "pxa2xx-uart.2");
 
         clk = clk_register_mux(NULL, "ssp0_mux", ssp_parent,
-                                ARRAY_SIZE(ssp_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(ssp_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apbc_base + APBC_SSP0, 4, 3, 0, &clk_lock);
         clk_register_clkdev(clk, "uart_mux.0", NULL);
 
@@ -243,7 +247,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, NULL, "mmp-ssp.0");
 
         clk = clk_register_mux(NULL, "ssp1_mux", ssp_parent,
-                                ARRAY_SIZE(ssp_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(ssp_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apbc_base + APBC_SSP1, 4, 3, 0, &clk_lock);
         clk_register_clkdev(clk, "ssp_mux.1", NULL);
 
@@ -256,7 +261,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, NULL, "pxa3xx-nand.0");
 
         clk = clk_register_mux(NULL, "sdh0_mux", sdh_parent,
-                                ARRAY_SIZE(sdh_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(sdh_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apmu_base + APMU_SDH0, 6, 1, 0, &clk_lock);
         clk_register_clkdev(clk, "sdh0_mux", NULL);
 
@@ -265,7 +271,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, NULL, "sdhci-pxa.0");
 
         clk = clk_register_mux(NULL, "sdh1_mux", sdh_parent,
-                                ARRAY_SIZE(sdh_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(sdh_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apmu_base + APMU_SDH1, 6, 1, 0, &clk_lock);
         clk_register_clkdev(clk, "sdh1_mux", NULL);
 
@@ -282,7 +289,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, "sph_clk", NULL);
 
         clk = clk_register_mux(NULL, "disp0_mux", disp_parent,
-                                ARRAY_SIZE(disp_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(disp_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apmu_base + APMU_DISP0, 6, 1, 0, &clk_lock);
         clk_register_clkdev(clk, "disp_mux.0", NULL);
 
@@ -291,7 +299,8 @@ void __init pxa910_clk_init(void)
         clk_register_clkdev(clk, NULL, "mmp-disp.0");
 
         clk = clk_register_mux(NULL, "ccic0_mux", ccic_parent,
-                                ARRAY_SIZE(ccic_parent), CLK_SET_RATE_PARENT,
+                                ARRAY_SIZE(ccic_parent),
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
                                 apmu_base + APMU_CCIC0, 6, 1, 0, &clk_lock);
         clk_register_clkdev(clk, "ccic_mux.0", NULL);
 
@@ -301,8 +310,8 @@ void __init pxa910_clk_init(void)
 
         clk = clk_register_mux(NULL, "ccic0_phy_mux", ccic_phy_parent,
                                 ARRAY_SIZE(ccic_phy_parent),
-                                CLK_SET_RATE_PARENT, apmu_base + APMU_CCIC0,
-                                7, 1, 0, &clk_lock);
+                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
+                                apmu_base + APMU_CCIC0, 7, 1, 0, &clk_lock);
         clk_register_clkdev(clk, "ccic_phy_mux.0", NULL);
 
         clk = mmp_clk_register_apmu("ccic0_phy", "ccic0_phy_mux",