diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2006-06-24 16:21:32 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-24 16:21:32 -0400 |
| commit | 46491c94d39a519178ba8c6b5b5d6a839210124d (patch) | |
| tree | a2b803640a19edfc4d1919b8f49d3304e5a20a55 /arch/arm/mach-s3c2410 | |
| parent | 73e55cb3b3549d0174d1dadb755200938232e8d0 (diff) | |
[ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON
Patch from Ben Dooks
The current S3C2412 support has moved to using
S3C24XX_DCLKCON unless the specific DCLKCON is
required (S3C2412_DCLKCON or S3C2410_DKCLKCON)
Move the few places using S3C2410_DCLKCON to
S3C24XX_DCLKCON
Depends on Patch #3635/1
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/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/clock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index 90a0610b5142..e13fb6778890 100644 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c | |||
| @@ -268,14 +268,14 @@ struct clk clk_usb_bus = { | |||
| 268 | 268 | ||
| 269 | static int s3c24xx_dclk_enable(struct clk *clk, int enable) | 269 | static int s3c24xx_dclk_enable(struct clk *clk, int enable) |
| 270 | { | 270 | { |
| 271 | unsigned long dclkcon = __raw_readl(S3C2410_DCLKCON); | 271 | unsigned long dclkcon = __raw_readl(S3C24XX_DCLKCON); |
| 272 | 272 | ||
| 273 | if (enable) | 273 | if (enable) |
| 274 | dclkcon |= clk->ctrlbit; | 274 | dclkcon |= clk->ctrlbit; |
| 275 | else | 275 | else |
| 276 | dclkcon &= ~clk->ctrlbit; | 276 | dclkcon &= ~clk->ctrlbit; |
| 277 | 277 | ||
| 278 | __raw_writel(dclkcon, S3C2410_DCLKCON); | 278 | __raw_writel(dclkcon, S3C24XX_DCLKCON); |
| 279 | 279 | ||
| 280 | return 0; | 280 | return 0; |
| 281 | } | 281 | } |
| @@ -294,7 +294,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent) | |||
| 294 | 294 | ||
| 295 | clk->parent = parent; | 295 | clk->parent = parent; |
| 296 | 296 | ||
| 297 | dclkcon = __raw_readl(S3C2410_DCLKCON); | 297 | dclkcon = __raw_readl(S3C24XX_DCLKCON); |
| 298 | 298 | ||
| 299 | if (clk->ctrlbit == S3C2410_DCLKCON_DCLK0EN) { | 299 | if (clk->ctrlbit == S3C2410_DCLKCON_DCLK0EN) { |
| 300 | if (uclk) | 300 | if (uclk) |
| @@ -308,7 +308,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent) | |||
| 308 | dclkcon &= ~S3C2410_DCLKCON_DCLK1_UCLK; | 308 | dclkcon &= ~S3C2410_DCLKCON_DCLK1_UCLK; |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | __raw_writel(dclkcon, S3C2410_DCLKCON); | 311 | __raw_writel(dclkcon, S3C24XX_DCLKCON); |
| 312 | 312 | ||
| 313 | return 0; | 313 | return 0; |
| 314 | } | 314 | } |
