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 <r64343@freescale.com>

diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c
index 84e0176b280a888b3769b4cfca5d6bd3bf333039..26ced126ac4d3d200e8f7f37701c9f9038617fe6 100644 (file)
--- 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 */