diff options
author | Dallas Foley <dfoley@techsol.ca> | 2008-10-16 16:46:07 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-16 16:48:28 +0100 |
commit | 7e90d760ee14547145d7da01be4855ae7be5fe2c (patch) | |
tree | b9b957e8e5884d603a2c1fd58175c2e9cd302514 | |
parent | 04ab591808565f968d4406f6435090ad671ebdab (diff) | |
download | linux-3.10-7e90d760ee14547145d7da01be4855ae7be5fe2c.tar.gz linux-3.10-7e90d760ee14547145d7da01be4855ae7be5fe2c.tar.bz2 linux-3.10-7e90d760ee14547145d7da01be4855ae7be5fe2c.zip |
[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 306cc9c6f9e..d41cccd6a25 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) if (parent == s3c24xx_pwmclk_tclk(id)) bits = S3C2410_TCFG1_MUX_TCLK << shift; else if (parent == s3c24xx_pwmclk_tdiv(id)) - bits = clk_pwm_tdiv_bits(to_tdiv(clk)) << shift; + bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift; else return -EINVAL; |