aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-integrator/core.c')
-rw-r--r--arch/arm/mach-integrator/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 82ebc8d772d3..4b38e13667ac 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -209,7 +209,7 @@ static struct amba_pl010_data integrator_uart_data = {
209 209
210#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) 210#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL)
211 211
212static DEFINE_SPINLOCK(cm_lock); 212static DEFINE_RAW_SPINLOCK(cm_lock);
213 213
214/** 214/**
215 * cm_control - update the CM_CTRL register. 215 * cm_control - update the CM_CTRL register.
@@ -221,10 +221,10 @@ void cm_control(u32 mask, u32 set)
221 unsigned long flags; 221 unsigned long flags;
222 u32 val; 222 u32 val;
223 223
224 spin_lock_irqsave(&cm_lock, flags); 224 raw_spin_lock_irqsave(&cm_lock, flags);
225 val = readl(CM_CTRL) & ~mask; 225 val = readl(CM_CTRL) & ~mask;
226 writel(val | set, CM_CTRL); 226 writel(val | set, CM_CTRL);
227 spin_unlock_irqrestore(&cm_lock, flags); 227 raw_spin_unlock_irqrestore(&cm_lock, flags);
228} 228}
229 229
230EXPORT_SYMBOL(cm_control); 230EXPORT_SYMBOL(cm_control);