From 7e90d760ee14547145d7da01be4855ae7be5fe2c Mon Sep 17 00:00:00 2001 From: Dallas Foley <dfoley@techsol.ca> Date: Thu, 16 Oct 2008 16:46:07 +0100 Subject: [PATCH] [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> --- arch/arm/plat-s3c24xx/pwm-clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) 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; -- GitLab