aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnson Huang <b20788@freescale.com>2011-09-01 13:15:14 +0800
committerAnson Huang <b20788@freescale.com>2011-09-01 16:13:09 +0800
commit32dee1ecc3224a8b79e056ff3545070bc38b9b0f (patch)
tree004f349a48c272b91d74586e605f2c869c983191 /arch
parentdc2b325101e47851c7994964c2614273b99422fe (diff)
ENGR00155731 [MX6]clock disable should function
un-comment __clk_disable function and __clk_disable_inwait function. Signed-off-by: Anson Huang <b20788@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx6/clock.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c
index 61e69f6384e..3a83c772fc6 100644
--- a/arch/arm/mach-mx6/clock.c
+++ b/arch/arm/mach-mx6/clock.c
@@ -136,9 +136,7 @@ static void _clk_disable(struct clk *clk)
u32 reg;
reg = __raw_readl(clk->enable_reg);
reg &= ~(MXC_CCM_CCGRx_CG_MASK << clk->enable_shift);
- /* TODO: un-comment the disable code */
- /* __raw_writel(reg, clk->enable_reg); */
-
+ __raw_writel(reg, clk->enable_reg);
}
static void _clk_disable_inwait(struct clk *clk)
@@ -147,8 +145,7 @@ static void _clk_disable_inwait(struct clk *clk)
reg = __raw_readl(clk->enable_reg);
reg &= ~(MXC_CCM_CCGRx_CG_MASK << clk->enable_shift);
reg |= 1 << clk->enable_shift;
- /* TODO: un-comment the disable code */
- /* __raw_writel(reg, clk->enable_reg); */
+ __raw_writel(reg, clk->enable_reg);
}
/*