| Date: | 2010-05-31 23:23:58 (13 years 6 months ago) |
|---|---|
| Author: | Lars C. |
| Commit: | 9a5fad34fa75aeeb9d916bfce9f0719a51f21e00 |
| Message: | jz4740: PWM: Use external clock as pwm source and set abrupbt
shutdown bit |
| Files: |
arch/mips/jz4740/pwm.c (2 diffs) arch/mips/jz4740/timer.h (1 diff) |
Change Details
| arch/mips/jz4740/pwm.c | ||
|---|---|---|
| 49 | 49 | struct pwm_device *pwm; |
| 50 | 50 | |
| 51 | 51 | if (!jz4740_pwm_clk) { |
| 52 | jz4740_pwm_clk = clk_get(NULL, "pclk"); | |
| 52 | jz4740_pwm_clk = clk_get(NULL, "ext"); | |
| 53 | 53 | |
| 54 | 54 | if (IS_ERR(jz4740_pwm_clk)) |
| 55 | 55 | return ERR_PTR(PTR_ERR(jz4740_pwm_clk)); |
| ... | ... | |
| 144 | 144 | jz4740_timer_set_duty(id, duty); |
| 145 | 145 | jz4740_timer_set_period(id, period); |
| 146 | 146 | |
| 147 | ctrl = JZ_TIMER_CTRL_PRESCALER(prescaler) | JZ_TIMER_CTRL_SRC_PCLK; | |
| 147 | ctrl = JZ_TIMER_CTRL_PRESCALER(prescaler) | JZ_TIMER_CTRL_SRC_EXT | | |
| 148 | JZ_TIMER_CTRL_PWM_ABBRUPT_SHUTDOWN; | |
| 148 | 149 | |
| 149 | 150 | jz4740_timer_set_ctrl(id, ctrl); |
| 150 | 151 | |
| arch/mips/jz4740/timer.h | ||
|---|---|---|
| 40 | 40 | #define JZ_TIMER_IRQ_HALF(x) BIT((x) + 0x10) |
| 41 | 41 | #define JZ_TIMER_IRQ_FULL(x) BIT(x) |
| 42 | 42 | |
| 43 | #define JZ_TIMER_CTRL_PWM_ACTIVE_LOW BIT(8) | |
| 44 | #define JZ_TIMER_CTRL_PWM_ENABLE BIT(7) | |
| 45 | #define JZ_TIMER_CTRL_PRESCALE_MASK 0x1c | |
| 46 | #define JZ_TIMER_CTRL_PRESCALE_OFFSET 0x3 | |
| 47 | #define JZ_TIMER_CTRL_PRESCALE_1 (0 << 3) | |
| 48 | #define JZ_TIMER_CTRL_PRESCALE_4 (1 << 3) | |
| 49 | #define JZ_TIMER_CTRL_PRESCALE_16 (2 << 3) | |
| 50 | #define JZ_TIMER_CTRL_PRESCALE_64 (3 << 3) | |
| 51 | #define JZ_TIMER_CTRL_PRESCALE_256 (4 << 3) | |
| 52 | #define JZ_TIMER_CTRL_PRESCALE_1024 (5 << 3) | |
| 43 | #define JZ_TIMER_CTRL_PWM_ABBRUPT_SHUTDOWN BIT(9) | |
| 44 | #define JZ_TIMER_CTRL_PWM_ACTIVE_LOW BIT(8) | |
| 45 | #define JZ_TIMER_CTRL_PWM_ENABLE BIT(7) | |
| 46 | #define JZ_TIMER_CTRL_PRESCALE_MASK 0x1c | |
| 47 | #define JZ_TIMER_CTRL_PRESCALE_OFFSET 0x3 | |
| 48 | #define JZ_TIMER_CTRL_PRESCALE_1 (0 << 3) | |
| 49 | #define JZ_TIMER_CTRL_PRESCALE_4 (1 << 3) | |
| 50 | #define JZ_TIMER_CTRL_PRESCALE_16 (2 << 3) | |
| 51 | #define JZ_TIMER_CTRL_PRESCALE_64 (3 << 3) | |
| 52 | #define JZ_TIMER_CTRL_PRESCALE_256 (4 << 3) | |
| 53 | #define JZ_TIMER_CTRL_PRESCALE_1024 (5 << 3) | |
| 53 | 54 | |
| 54 | 55 | #define JZ_TIMER_CTRL_PRESCALER(x) ((x) << JZ_TIMER_CTRL_PRESCALE_OFFSET) |
| 55 | 56 | |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9
