diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:20:08 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:20:08 +0900 |
| commit | 86f82da586098f16d92b5637808c323f5455e935 (patch) | |
| tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 /arch/arm/plat-samsung/pwm-clock.c | |
| parent | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (diff) | |
| parent | e90a0f3c460406d6a5a698016bc525c3e6968cb6 (diff) | |
| download | blackbird-op-linux-86f82da586098f16d92b5637808c323f5455e935.tar.gz blackbird-op-linux-86f82da586098f16d92b5637808c323f5455e935.zip | |
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
Diffstat (limited to 'arch/arm/plat-samsung/pwm-clock.c')
| -rw-r--r-- | arch/arm/plat-samsung/pwm-clock.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/pwm-clock.c b/arch/arm/plat-samsung/pwm-clock.c index f1bba88ed2f5..a35ff3bcffe4 100644 --- a/arch/arm/plat-samsung/pwm-clock.c +++ b/arch/arm/plat-samsung/pwm-clock.c @@ -27,7 +27,7 @@ #include <plat/cpu.h> #include <plat/regs-timer.h> -#include <mach/pwm-clock.h> +#include <plat/pwm-clock.h> /* Each of the timers 0 through 5 go through the following * clock tree, with the inputs depending on the timers. @@ -339,8 +339,17 @@ static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent) unsigned long bits; unsigned long shift = S3C2410_TCFG1_SHIFT(id); + unsigned long mux_tclk; + + if (soc_is_s3c24xx()) + mux_tclk = S3C2410_TCFG1_MUX_TCLK; + else if (soc_is_s5p6440() || soc_is_s5p6450()) + mux_tclk = 0; + else + mux_tclk = S3C64XX_TCFG1_MUX_TCLK; + if (parent == s3c24xx_pwmclk_tclk(id)) - bits = S3C_TCFG1_MUX_TCLK << shift; + bits = mux_tclk << shift; else if (parent == s3c24xx_pwmclk_tdiv(id)) bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift; else |
