From 1f9cd2bf06f245a32c5a6b76c1b436c265aeec08 Mon Sep 17 00:00:00 2001 From: Jason Liu Date: Mon, 20 Feb 2012 11:18:40 +0800 Subject: [PATCH] ENGR00174897 i.mx6: clock: fix axi clock mux setting Fix the error in the axi clock mux setting, - reg = ((mux - 1) << MXC_CCM_CBCDR_AXI_ALT_SEL_OFFSET); + reg |= ((mux - 1) << MXC_CCM_CBCDR_AXI_ALT_SEL_OFFSET); Signed-off-by: Jason Liu --- arch/arm/mach-mx6/clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index 84e0176b280a..26ced126ac4d 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -1257,7 +1257,7 @@ static int _clk_axi_set_parent(struct clk *clk, struct clk *parent) /* Set the AXI_ALT_SEL mux. */ reg = __raw_readl(MXC_CCM_CBCDR) & ~MXC_CCM_CBCDR_AXI_ALT_SEL_MASK; - reg = ((mux - 1) << MXC_CCM_CBCDR_AXI_ALT_SEL_OFFSET); + reg |= ((mux - 1) << MXC_CCM_CBCDR_AXI_ALT_SEL_OFFSET); __raw_writel(reg, MXC_CCM_CBCDR); /* Set the AXI_SEL mux */ -- 2.39.2