Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29609
b: refs/heads/master
c: 46491c9
h: refs/heads/master
i:
  29607: 9565eb5
v: v3
  • Loading branch information
Ben Dooks authored and Russell King committed Jun 24, 2006
1 parent d4ea153 commit d26dfb5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 73e55cb3b3549d0174d1dadb755200938232e8d0
refs/heads/master: 46491c94d39a519178ba8c6b5b5d6a839210124d
8 changes: 4 additions & 4 deletions trunk/arch/arm/mach-s3c2410/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,14 @@ struct clk clk_usb_bus = {

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)
dclkcon |= clk->ctrlbit;
else
dclkcon &= ~clk->ctrlbit;

__raw_writel(dclkcon, S3C2410_DCLKCON);
__raw_writel(dclkcon, S3C24XX_DCLKCON);

return 0;
}
Expand All @@ -294,7 +294,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent)

clk->parent = parent;

dclkcon = __raw_readl(S3C2410_DCLKCON);
dclkcon = __raw_readl(S3C24XX_DCLKCON);

if (clk->ctrlbit == S3C2410_DCLKCON_DCLK0EN) {
if (uclk)
Expand All @@ -308,7 +308,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent)
dclkcon &= ~S3C2410_DCLKCON_DCLK1_UCLK;
}

__raw_writel(dclkcon, S3C2410_DCLKCON);
__raw_writel(dclkcon, S3C24XX_DCLKCON);

return 0;
}
Expand Down

0 comments on commit d26dfb5

Please sign in to comment.