Date: | 2011-08-18 19:08:41 (12 years 7 months ago) |
---|---|
Author: | Maarten ter Huurne |
Commit: | aff7f39c96a8989716d1d308e7740593d04606bf |
Message: | Revert "jz4740_timer: Mask the "half" timer
interrupts in plat_time_init(). This fixes a hang when booting on
the Dingoo A320 in USB boot mode with the Rockbox USBtool." This reverts commit 08d2d24b276d180d4b086eaef64e802271bcb3d6. |
Files: |
arch/mips/jz4740/time.c (1 diff) arch/mips/jz4740/timer.h (1 diff) |
Change Details
arch/mips/jz4740/time.c | ||
---|---|---|
136 | 136 | |
137 | 137 | jz4740_timer_set_period(TIMER_CLOCKEVENT, jz4740_jiffies_per_tick); |
138 | 138 | jz4740_timer_irq_full_enable(TIMER_CLOCKEVENT); |
139 | jz4740_timer_irq_half_disable(TIMER_CLOCKEVENT); | |
140 | 139 | |
141 | 140 | jz4740_timer_irq_full_disable(TIMER_CLOCKSOURCE); |
142 | jz4740_timer_irq_half_disable(TIMER_CLOCKSOURCE); | |
143 | 141 | jz4740_timer_set_period(TIMER_CLOCKSOURCE, 0xffff); |
144 | 142 | |
145 | 143 | jz4740_timer_enable(TIMER_CLOCKEVENT); |
arch/mips/jz4740/timer.h | ||
---|---|---|
122 | 122 | writel(JZ_TIMER_IRQ_FULL(timer), jz4740_timer_base + JZ_REG_TIMER_MASK_SET); |
123 | 123 | } |
124 | 124 | |
125 | static inline void jz4740_timer_irq_half_enable(unsigned int timer) | |
126 | { | |
127 | writel(JZ_TIMER_IRQ_HALF(timer), jz4740_timer_base + JZ_REG_TIMER_FLAG_CLEAR); | |
128 | writel(JZ_TIMER_IRQ_HALF(timer), jz4740_timer_base + JZ_REG_TIMER_MASK_CLEAR); | |
129 | } | |
130 | ||
131 | static inline void jz4740_timer_irq_half_disable(unsigned int timer) | |
132 | { | |
133 | writel(JZ_TIMER_IRQ_HALF(timer), jz4740_timer_base + JZ_REG_TIMER_MASK_SET); | |
134 | } | |
135 | ||
136 | 125 | static inline void jz4740_timer_set_ctrl(unsigned int timer, uint16_t ctrl) |
137 | 126 | { |
138 | 127 | writew(ctrl, jz4740_timer_base + JZ_REG_TIMER_CTRL(timer)); |
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