From dfa498c9089739b34a934b68434515570136ffa5 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 21 Nov 2008 10:36:06 +0000 Subject: [PATCH] --- yaml --- r: 123821 b: refs/heads/master c: 7d2dbcf9faad074c52a941d01fc21eea3c95ca33 h: refs/heads/master i: 123819: 8b75fe94156f7d068cbc36507aa4f3fdf879a2c0 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c/pwm-clock.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b1d1f10fd25..10f47e9bd46a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82fd8e681d60a195ce6e9fc783d0ebe7a81b1ead +refs/heads/master: 7d2dbcf9faad074c52a941d01fc21eea3c95ca33 diff --git a/trunk/arch/arm/plat-s3c/pwm-clock.c b/trunk/arch/arm/plat-s3c/pwm-clock.c index b0fcbc1fb64b..e07d82891a92 100644 --- a/trunk/arch/arm/plat-s3c/pwm-clock.c +++ b/trunk/arch/arm/plat-s3c/pwm-clock.c @@ -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 { @@ -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 {