diff options
| author | Jason Liu <r64343@freescale.com> | 2012-02-20 11:18:40 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-02-21 16:41:21 +0800 |
| commit | 33b2df341b07ba3f95bfdc3d1fe426360e225e2b (patch) | |
| tree | 5725ad232b118f592e1b5d152cc22fa4d7d5b5e0 /arch/arm/mach-mx6/clock.c | |
| parent | 022a054b49b95db01069740e691ed72b4fc82932 (diff) | |
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>
Diffstat (limited to 'arch/arm/mach-mx6/clock.c')
| -rw-r--r-- | arch/arm/mach-mx6/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |