Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123821
b: refs/heads/master
c: 7d2dbcf
h: refs/heads/master
i:
  123819: 8b75fe9
v: v3
  • Loading branch information
Ben Dooks committed Dec 15, 2008
1 parent 2a4edda commit dfa498c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 82fd8e681d60a195ce6e9fc783d0ebe7a81b1ead
refs/heads/master: 7d2dbcf9faad074c52a941d01fc21eea3c95ca33
6 changes: 4 additions & 2 deletions trunk/arch/arm/plat-s3c/pwm-clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@
* tclk -------------------------/
*/

static struct clk clk_timer_scaler[];

static unsigned long clk_pwm_scaler_get_rate(struct clk *clk)
{
unsigned long tcfg0 = __raw_readl(S3C2410_TCFG0);

if (clk->id == 1) {
if (clk == &clk_timer_scaler[1]) {
tcfg0 &= S3C2410_TCFG_PRESCALER1_MASK;
tcfg0 >>= S3C2410_TCFG_PRESCALER1_SHIFT;
} else {
Expand Down Expand Up @@ -114,7 +116,7 @@ static int clk_pwm_scaler_set_rate(struct clk *clk, unsigned long rate)
local_irq_save(flags);
tcfg0 = __raw_readl(S3C2410_TCFG0);

if (clk->id == 1) {
if (clk == &clk_timer_scaler[1]) {
tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
tcfg0 |= divisor << S3C2410_TCFG_PRESCALER1_SHIFT;
} else {
Expand Down

0 comments on commit dfa498c

Please sign in to comment.