diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-01 14:05:07 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-09 09:01:40 -0400 |
commit | 49cf3f29a1ef2e59f1be823e376c1fbac586eb8d (patch) | |
tree | df74a086f491e08317e1fe88c5c160f7eef7d7f0 /include/linux/i8253.h | |
parent | 16f871bc30f86560017b9d34520593a28e08f373 (diff) |
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: Ralf 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.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/i8253.h')
-rw-r--r-- | include/linux/i8253.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/i8253.h b/include/linux/i8253.h index 13048d335368..1ec6323a1507 100644 --- a/include/linux/i8253.h +++ b/include/linux/i8253.h | |||
@@ -9,7 +9,9 @@ | |||
9 | #ifndef __LINUX_I8253_H | 9 | #ifndef __LINUX_I8253_H |
10 | #define __LINUX_I8253_H | 10 | #define __LINUX_I8253_H |
11 | 11 | ||
12 | #include <linux/param.h> | ||
12 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
14 | #include <linux/timex.h> | ||
13 | #include <asm/i8253.h> | 15 | #include <asm/i8253.h> |
14 | 16 | ||
15 | /* i8253A PIT registers */ | 17 | /* i8253A PIT registers */ |
@@ -17,6 +19,8 @@ | |||
17 | #define PIT_CH0 0x40 | 19 | #define PIT_CH0 0x40 |
18 | #define PIT_CH2 0x42 | 20 | #define PIT_CH2 0x42 |
19 | 21 | ||
22 | #define PIT_LATCH ((PIT_TICK_RATE + HZ/2) / HZ) | ||
23 | |||
20 | #define inb_pit inb_p | 24 | #define inb_pit inb_p |
21 | #define outb_pit outb_p | 25 | #define outb_pit outb_p |
22 | 26 | ||