From: Tony Lin Date: Fri, 2 Sep 2011 06:36:11 +0000 (+0800) Subject: ENGR00155893 [mx6q]clock: correct set parent function X-Git-Tag: v3.0.35-fsl_4.1.0~2268 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=04743f3df550bfe577e9c693cbab956d3318c7dd;p=karo-tx-linux.git ENGR00155893 [mx6q]clock: correct set parent function set periph_clk_sel to derive clock from periph_clk2_clk Signed-off-by: Tony Lin --- diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index 0ccae284bb07..58484407ec3b 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -938,9 +938,12 @@ static int _clk_periph_set_parent(struct clk *clk, struct clk *parent) reg &= ~MXC_CCM_CBCDR_PERIPH_CLK_SEL; __raw_writel(reg, MXC_CCM_CBCDR); } else { - /* Set the periph_clk2_podf divider to divide by 1. */ reg = __raw_readl(MXC_CCM_CBCDR); + /* Set the periph_clk2_podf divider to divide by 1. */ reg &= ~MXC_CCM_CBCDR_PERIPH_CLK2_PODF_MASK; + /* Clear periph_clk_sel to select periph_clk2. */ + reg |= MXC_CCM_CBCDR_PERIPH_CLK_SEL; + __raw_writel(reg, MXC_CCM_CBCDR); /* Set the periph_clk2_sel mux. */