提交 46491c94 编写于 作者: B Ben Dooks 提交者: Russell King

[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: NBen Dooks <ben-linux@fluff.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 73e55cb3
...@@ -268,14 +268,14 @@ struct clk clk_usb_bus = { ...@@ -268,14 +268,14 @@ struct clk clk_usb_bus = {
static int s3c24xx_dclk_enable(struct clk *clk, int enable) static int s3c24xx_dclk_enable(struct clk *clk, int enable)
{ {
unsigned long dclkcon = __raw_readl(S3C2410_DCLKCON); unsigned long dclkcon = __raw_readl(S3C24XX_DCLKCON);
if (enable) if (enable)
dclkcon |= clk->ctrlbit; dclkcon |= clk->ctrlbit;
else else
dclkcon &= ~clk->ctrlbit; dclkcon &= ~clk->ctrlbit;
__raw_writel(dclkcon, S3C2410_DCLKCON); __raw_writel(dclkcon, S3C24XX_DCLKCON);
return 0; return 0;
} }
...@@ -294,7 +294,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent) ...@@ -294,7 +294,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent)
clk->parent = parent; clk->parent = parent;
dclkcon = __raw_readl(S3C2410_DCLKCON); dclkcon = __raw_readl(S3C24XX_DCLKCON);
if (clk->ctrlbit == S3C2410_DCLKCON_DCLK0EN) { if (clk->ctrlbit == S3C2410_DCLKCON_DCLK0EN) {
if (uclk) if (uclk)
...@@ -308,7 +308,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent) ...@@ -308,7 +308,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent)
dclkcon &= ~S3C2410_DCLKCON_DCLK1_UCLK; dclkcon &= ~S3C2410_DCLKCON_DCLK1_UCLK;
} }
__raw_writel(dclkcon, S3C2410_DCLKCON); __raw_writel(dclkcon, S3C24XX_DCLKCON);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册