Commit 49cf3f29 authored by Ralf Baechle's avatar Ralf Baechle Committed by Thomas Gleixner

i8253: Consolidate definitions of PIT_LATCH

x86 defines PIT_LATCH as LATCH which in <linux/timex.h> is defined as
((CLOCK_TICK_RATE + HZ/2) / HZ) and <asm/timex.h> again defines
CLOCK_TICK_RATE as PIT_TICK_RATE.

MIPS defines PIT_LATCH as LATCH which in <linux/timex.h> is defined as
((CLOCK_TICK_RATE + HZ/2) / HZ) and <asm/timex.h> again defines
CLOCK_TICK_RATE as 1193182.

ARM defines PITCH_LATCH as ((PIT_TICK_RATE + HZ / 2) / HZ) - and that's
the sanest thing and equivalent to above definitions so use that as the
new definition in <linux/i8253.h>.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/20110601180610.832810002@duck.linux-mips.netSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 16f871bc
#ifndef __ASMARM_I8253_H #ifndef __ASMARM_I8253_H
#define __ASMARM_I8253_H #define __ASMARM_I8253_H
#define PIT_LATCH ((PIT_TICK_RATE + HZ / 2) / HZ)
#endif #endif
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
#ifndef __ASM_I8253_H #ifndef __ASM_I8253_H
#define __ASM_I8253_H #define __ASM_I8253_H
#define PIT_LATCH LATCH
extern void setup_pit_timer(void); extern void setup_pit_timer(void);
#endif /* __ASM_I8253_H */ #endif /* __ASM_I8253_H */
#ifndef _ASM_X86_I8253_H #ifndef _ASM_X86_I8253_H
#define _ASM_X86_I8253_H #define _ASM_X86_I8253_H
#define PIT_LATCH LATCH
extern void setup_pit_timer(void); extern void setup_pit_timer(void);
#endif /* _ASM_X86_I8253_H */ #endif /* _ASM_X86_I8253_H */
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
#ifndef __LINUX_I8253_H #ifndef __LINUX_I8253_H
#define __LINUX_I8253_H #define __LINUX_I8253_H
#include <linux/param.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/timex.h>
#include <asm/i8253.h> #include <asm/i8253.h>
/* i8253A PIT registers */ /* i8253A PIT registers */
...@@ -17,6 +19,8 @@ ...@@ -17,6 +19,8 @@
#define PIT_CH0 0x40 #define PIT_CH0 0x40
#define PIT_CH2 0x42 #define PIT_CH2 0x42
#define PIT_LATCH ((PIT_TICK_RATE + HZ/2) / HZ)
#define inb_pit inb_p #define inb_pit inb_p
#define outb_pit outb_p #define outb_pit outb_p
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment