summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJason Wang <jason77.wang@gmail.com>2010-08-21 16:24:04 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2010-08-21 12:22:43 +0200
commit7f67bff58662604874778e6853e5c394f944e554 (patch)
tree56bc733a19732d137b824f571f9e1b6e0f5e4351 /arch/arm
parenta38b372fc2a3d8fe7ddbeab94d4c8bcb721f2403 (diff)
downloadblackbird-obmc-linux-7f67bff58662604874778e6853e5c394f944e554.tar.gz
blackbird-obmc-linux-7f67bff58662604874778e6853e5c394f944e554.zip
mx5/clock: fix clear bit fields issue in _clk_ccgr_disable function
We can see MXC_CCM_CCGRx_MOD_OFF is defined as 0 while MXC_CCM_CCGRx_CG_MASK is defined as 0x3 in crm_regs.h, here in the _clk_ccgr_disable function, we want to clear the corresponding enable bit fields to disable this clock, so we should choose MASK instead of OFF otherwise clocks can't be disabled. Signed-off-by: Jason Wang <jason77.wang@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mx5/clock-mx51.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51.c b/arch/arm/mach-mx5/clock-mx51.c
index 6af69def357f..57c10a9926cc 100644
--- a/arch/arm/mach-mx5/clock-mx51.c
+++ b/arch/arm/mach-mx5/clock-mx51.c
@@ -56,7 +56,7 @@ static void _clk_ccgr_disable(struct clk *clk)
{
u32 reg;
reg = __raw_readl(clk->enable_reg);
- reg &= ~(MXC_CCM_CCGRx_MOD_OFF << clk->enable_shift);
+ reg &= ~(MXC_CCM_CCGRx_CG_MASK << clk->enable_shift);
__raw_writel(reg, clk->enable_reg);
}
OpenPOWER on IntegriCloud