aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/smp_scu.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-01 15:58:15 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-01 15:58:15 +0100
commitb00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch)
treedde815788aaea3e336aaaf24763311ce63a22e1b /arch/arm/kernel/smp_scu.c
parent75639e7ee1401b3876c7a00ffe96ea8027668690 (diff)
parentd6797322231af98b9bb4afb175dd614cf511e5f7 (diff)
downloadkernel_samsung_tuna-b00615d163cd24fa98d155acfc1f9d81d6fe1103.zip
kernel_samsung_tuna-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.gz
kernel_samsung_tuna-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.bz2
Merge branch 'topic/pcm-dma-fix' into topic/core-change
Diffstat (limited to 'arch/arm/kernel/smp_scu.c')
-rw-r--r--arch/arm/kernel/smp_scu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c
index d3831f6..9ab4149 100644
--- a/arch/arm/kernel/smp_scu.c
+++ b/arch/arm/kernel/smp_scu.c
@@ -37,6 +37,10 @@ void __init scu_enable(void __iomem *scu_base)
u32 scu_ctrl;
scu_ctrl = __raw_readl(scu_base + SCU_CTRL);
+ /* already enabled? */
+ if (scu_ctrl & 1)
+ return;
+
scu_ctrl |= 1;
__raw_writel(scu_ctrl, scu_base + SCU_CTRL);