From 44bb47258732dc63bce5d8abb9483fbac575c284 Mon Sep 17 00:00:00 2001 From: Huang Shijie Date: Mon, 26 May 2014 15:31:14 +0800 Subject: [PATCH] ARM: clk: imx: remove the CLK_SET_RATE_NO_REPARENT for imx_clk_mux_flags 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 Signed-off-by: Shawn Guo --- arch/arm/mach-imx/clk.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h index e29f6ebe9f39..32d6253b286f 100644 --- a/arch/arm/mach-imx/clk.h +++ b/arch/arm/mach-imx/clk.h @@ -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, -- 2.39.5