summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-04-02 10:00:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-04-02 10:00:10 +0100
commit2b2ee1585a98be250f86c61e6ec70159b30e48e5 (patch)
tree2f12605ceaad24be1440f8efade82040cb9b269f /arch/arm
parentdee9b2e932ef7c8f19540ad67e425fae30f33421 (diff)
downloadlinux-3.10-2b2ee1585a98be250f86c61e6ec70159b30e48e5.tar.gz
linux-3.10-2b2ee1585a98be250f86c61e6ec70159b30e48e5.tar.bz2
linux-3.10-2b2ee1585a98be250f86c61e6ec70159b30e48e5.zip
[ARM] 3448/1: [S3C2410] Settle delay when _enabling_ USB PLL
Patch from Ben Dooks Fix the bug in the UPLL enable code which should have put a 200uS delay in if enabling the USB PLL from the state where it is off. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2410/clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c
index fec02c92f95..b7f85e6d6b7 100644
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
@@ -249,7 +249,7 @@ static int s3c24xx_upll_enable(struct clk *clk, int enable)
/* if we started the UPLL, then allow to settle */
- if (enable && !(orig & S3C2410_CLKSLOW_UCLK_OFF))
+ if (enable && (orig & S3C2410_CLKSLOW_UCLK_OFF))
udelay(200);
return 0;