]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: clk: imx: remove the CLK_SET_RATE_NO_REPARENT for imx_clk_mux_flags
authorHuang Shijie <b32955@freescale.com>
Mon, 26 May 2014 07:31:14 +0000 (15:31 +0800)
committerNitin Garg <nitin.garg@freescale.com>
Fri, 16 Jan 2015 03:16:36 +0000 (21:16 -0600)
The clocks for Quadspi controller may be different when different
NOR flashes are connected to the board.

But the CLK_SET_RATE_NO_REPARENT flag in the current imx_clk_mux_flags
makes the clock do not have the re-parent capability.

This patch removes the CLK_SET_RATE_NO_REPARENT for imx_clk_mux_flags.
It makes the Quadspi happy.

Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
arch/arm/mach-imx/clk.h

index e29f6ebe9f39d0047abce6e010b9e577a1db14bc..32d6253b286f4a50b57eed3eb2f1db60f715a2f9 100644 (file)
@@ -108,8 +108,7 @@ static inline struct clk *imx_clk_mux_flags(const char *name,
                int num_parents, unsigned long flags)
 {
        return clk_register_mux(NULL, name, parents, num_parents,
-                       flags | CLK_SET_RATE_NO_REPARENT, reg, shift, width, 0,
-                       &imx_ccm_lock);
+                       flags, reg, shift, width, 0, &imx_ccm_lock);
 }
 
 static inline struct clk *imx_clk_fixed_factor(const char *name,