diff options
author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:11:37 -0600 |
---|---|---|
committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:11:37 -0600 |
commit | 91a39589cb0607d402347bc1427c7dcf5d340a44 (patch) | |
tree | 44c850d4a4abfc9e966d678c153186e4ef8e7d8c /arch | |
parent | 9d8173db2b556e5d60b6e217dddd3b267a50c154 (diff) |
CR ENGR00028177: Fix clock enable/disable functions for MX27 VPU.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-fix_mx27_vpu_clock_enable_disable.patch
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx27/clock.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-mx27/clock.c b/arch/arm/mach-mx27/clock.c index 0f0ab292124a..43e84a5ee120 100644 --- a/arch/arm/mach-mx27/clock.c +++ b/arch/arm/mach-mx27/clock.c @@ -193,14 +193,22 @@ static void _clk_fec_disable(struct clk *clk) static int _clk_vpu_enable(struct clk *clk) { - _clk_pccr01_enable(CCM_PCCR1_VPU_BAUD_MASK, CCM_PCCR1_HCLK_VPU_MASK); + unsigned long reg; + + reg = __raw_readl(CCM_PCCR1); + reg |= CCM_PCCR1_VPU_BAUD_MASK | CCM_PCCR1_HCLK_VPU_MASK; + __raw_writel(reg, CCM_PCCR1); return 0; } static void _clk_vpu_disable(struct clk *clk) { - _clk_pccr01_disable(CCM_PCCR1_VPU_BAUD_MASK, CCM_PCCR1_HCLK_VPU_MASK); + unsigned long reg; + + reg = __raw_readl(CCM_PCCR1); + reg &= ~(CCM_PCCR1_VPU_BAUD_MASK | CCM_PCCR1_HCLK_VPU_MASK); + __raw_writel(reg, CCM_PCCR1); } static int _clk_sahara2_enable(struct clk *clk) |