From mboxrd@z Thu Jan 1 00:00:00 1970 From: b32955@freescale.com (Huang Shijie) Date: Mon, 26 May 2014 15:46:51 +0800 Subject: [PATCH] ARM: clk: imx: remove the CLK_SET_RATE_NO_REPARENT for imx_clk_mux_flags In-Reply-To: <1401095002.3400.5.camel@paszta.hi.pengutronix.de> References: <1401089474-14346-1-git-send-email-b32955@freescale.com> <1401095002.3400.5.camel@paszta.hi.pengutronix.de> Message-ID: <20140526074649.GA29075@shlinux1.ap.freescale.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, May 26, 2014 at 11:03:22AM +0200, Philipp Zabel wrote: > Am Montag, den 26.05.2014, 15:31 +0800 schrieb Huang Shijie: > > 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 > > --- > > arch/arm/mach-imx/clk.h | 3 +-- > > 1 files changed, 1 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h > > index e29f6eb..32d6253 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, > > We need CLK_SET_RATE_NO_REPARENT on the audio/video multiplexers. > I think this change is the right thing for imx_clk_mux_flags, but at the > same you should make sure not to drop this flag where we want to control > a video PLL through the mux. thanks for the quick response. Could you tell me the clocks the audio/video used? we can add the CLK_SET_RATE_NO_REPARENT to them. thanks Huang Shijie