diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2011-11-04 02:39:34 +0100 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-11-06 05:53:01 +0100 |
commit | d8633c1da161de7e0b880d919d305a97c01372f4 (patch) | |
tree | 39848e1f3c3b155e214e819faafe30ff4185149b /arch/arm/plat-samsung/pwm.c | |
parent | ARM: SAMSUNG: Fix compile error due to kfree (diff) | |
download | linux-d8633c1da161de7e0b880d919d305a97c01372f4.tar.xz linux-d8633c1da161de7e0b880d919d305a97c01372f4.zip |
ARM: SAMSUNG: Add clk enable/disable of pwm
PWM timers use pclk("timers" clk) as parent clk. If this pclk is the
disabled state when PWM driver is probed, then it causes wrong read and
write operation about registers of PWM.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to '')
-rw-r--r-- | arch/arm/plat-samsung/pwm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/pwm.c b/arch/arm/plat-samsung/pwm.c index f37457c52064..dc1185dcf80d 100644 --- a/arch/arm/plat-samsung/pwm.c +++ b/arch/arm/plat-samsung/pwm.c @@ -299,6 +299,9 @@ static int s3c_pwm_probe(struct platform_device *pdev) goto err_clk_tin; } + clk_enable(pwm->clk); + clk_enable(pwm->clk_div); + local_irq_save(flags); tcon = __raw_readl(S3C2410_TCON); @@ -326,6 +329,8 @@ static int s3c_pwm_probe(struct platform_device *pdev) return 0; err_clk_tdiv: + clk_disable(pwm->clk_div); + clk_disable(pwm->clk); clk_put(pwm->clk_div); err_clk_tin: @@ -340,6 +345,8 @@ static int __devexit s3c_pwm_remove(struct platform_device *pdev) { struct pwm_device *pwm = platform_get_drvdata(pdev); + clk_disable(pwm->clk_div); + clk_disable(pwm->clk); clk_put(pwm->clk_div); clk_put(pwm->clk); kfree(pwm); |