Date:2011-08-18 19:08:41 (8 years 10 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
136136
137137    jz4740_timer_set_period(TIMER_CLOCKEVENT, jz4740_jiffies_per_tick);
138138    jz4740_timer_irq_full_enable(TIMER_CLOCKEVENT);
139    jz4740_timer_irq_half_disable(TIMER_CLOCKEVENT);
140139
141140    jz4740_timer_irq_full_disable(TIMER_CLOCKSOURCE);
142    jz4740_timer_irq_half_disable(TIMER_CLOCKSOURCE);
143141    jz4740_timer_set_period(TIMER_CLOCKSOURCE, 0xffff);
144142
145143    jz4740_timer_enable(TIMER_CLOCKEVENT);
arch/mips/jz4740/timer.h
122122    writel(JZ_TIMER_IRQ_FULL(timer), jz4740_timer_base + JZ_REG_TIMER_MASK_SET);
123123}
124124
125static 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
131static 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
136125static inline void jz4740_timer_set_ctrl(unsigned int timer, uint16_t ctrl)
137126{
138127    writew(ctrl, jz4740_timer_base + JZ_REG_TIMER_CTRL(timer));

Archive Download the corresponding diff file



interactive