diff options
author | Dallas Foley <dfoley@techsol.ca> | 2008-10-16 11:46:07 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-16 11:48:28 -0400 |
commit | 7e90d760ee14547145d7da01be4855ae7be5fe2c (patch) | |
tree | b9b957e8e5884d603a2c1fd58175c2e9cd302514 | |
parent | 04ab591808565f968d4406f6435090ad671ebdab (diff) |
[ARM] S3C24XX: pwm-clock set_parent mask fix
Fix s3c24xx pwm-clock supports use of the wrong clock when calculating
the bitmask when configuring the parent clock from the set_parent call.
Signed-off-by: Dallas Foley <dfoley@techsol.ca>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/plat-s3c24xx/pwm-clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c index 306cc9c6f9ef..d41cccd6a25f 100644 --- a/arch/arm/plat-s3c24xx/pwm-clock.c +++ b/arch/arm/plat-s3c24xx/pwm-clock.c | |||
@@ -315,7 +315,7 @@ static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent) | |||
315 | if (parent == s3c24xx_pwmclk_tclk(id)) | 315 | if (parent == s3c24xx_pwmclk_tclk(id)) |
316 | bits = S3C2410_TCFG1_MUX_TCLK << shift; | 316 | bits = S3C2410_TCFG1_MUX_TCLK << shift; |
317 | else if (parent == s3c24xx_pwmclk_tdiv(id)) | 317 | else if (parent == s3c24xx_pwmclk_tdiv(id)) |
318 | bits = clk_pwm_tdiv_bits(to_tdiv(clk)) << shift; | 318 | bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift; |
319 | else | 319 | else |
320 | return -EINVAL; | 320 | return -EINVAL; |
321 | 321 | ||