Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
arm/ixp4xx: Rename FREQ macro to avoid collisions
IXP4xx: Fix qmgr_release_queue() flushing unexpected queue entries.
+11
-13
+2
-2
arch/arm/mach-ixp4xx/common.c
+2
-2
arch/arm/mach-ixp4xx/common.c
···
432
432
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
433
433
};
434
434
435
-
unsigned long ixp4xx_timer_freq = FREQ;
435
+
unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;
436
436
EXPORT_SYMBOL(ixp4xx_timer_freq);
437
437
static void __init ixp4xx_clocksource_init(void)
438
438
{
···
496
496
497
497
static void __init ixp4xx_clockevent_init(void)
498
498
{
499
-
clockevent_ixp4xx.mult = div_sc(FREQ, NSEC_PER_SEC,
499
+
clockevent_ixp4xx.mult = div_sc(IXP4XX_TIMER_FREQ, NSEC_PER_SEC,
500
500
clockevent_ixp4xx.shift);
501
501
clockevent_ixp4xx.max_delta_ns =
502
502
clockevent_delta2ns(0xfffffffe, &clockevent_ixp4xx);
+3
-2
arch/arm/mach-ixp4xx/include/mach/timex.h
+3
-2
arch/arm/mach-ixp4xx/include/mach/timex.h
···
10
10
* 66.66... MHz. We do a convulted calculation of CLOCK_TICK_RATE b/c the
11
11
* timer register ignores the bottom 2 bits of the LATCH value.
12
12
*/
13
-
#define FREQ 66666000
14
-
#define CLOCK_TICK_RATE (((FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ)
13
+
#define IXP4XX_TIMER_FREQ 66666000
14
+
#define CLOCK_TICK_RATE \
15
+
(((IXP4XX_TIMER_FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ)
15
16
+5
-4
arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+5
-4
arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
···
265
265
qmgr_queue_descs[queue], queue);
266
266
qmgr_queue_descs[queue][0] = '\x0';
267
267
#endif
268
+
269
+
while ((addr = qmgr_get_entry(queue)))
270
+
printk(KERN_ERR "qmgr: released queue %i not empty: 0x%08X\n",
271
+
queue, addr);
272
+
268
273
__raw_writel(0, &qmgr_regs->sram[queue]);
269
274
270
275
used_sram_bitmap[0] &= ~mask[0];
···
280
275
spin_unlock_irq(&qmgr_lock);
281
276
282
277
module_put(THIS_MODULE);
283
-
284
-
while ((addr = qmgr_get_entry(queue)))
285
-
printk(KERN_ERR "qmgr: released queue %i not empty: 0x%08X\n",
286
-
queue, addr);
287
278
}
288
279
289
280
static int qmgr_init(void)
+1
-5
drivers/input/misc/ixp4xx-beeper.c
+1
-5
drivers/input/misc/ixp4xx-beeper.c
···
69
69
}
70
70
71
71
if (value > 20 && value < 32767)
72
-
#ifndef FREQ
73
-
count = (ixp4xx_get_board_tick_rate() / (value * 4)) - 1;
74
-
#else
75
-
count = (FREQ / (value * 4)) - 1;
76
-
#endif
72
+
count = (IXP4XX_TIMER_FREQ / (value * 4)) - 1;
77
73
78
74
ixp4xx_spkr_control(pin, count);
79
75