lkml.org 
[lkml]   [2011]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:timers/cleanup] i8253: Consolidate definitions of PIT_LATCH
Commit-ID:  49cf3f29a1ef2e59f1be823e376c1fbac586eb8d
Gitweb: http://git.kernel.org/tip/49cf3f29a1ef2e59f1be823e376c1fbac586eb8d
Author: Ralf Baechle <ralf@linux-mips.org>
AuthorDate: Wed, 1 Jun 2011 19:05:07 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 9 Jun 2011 15:01:40 +0200

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>

---
arch/arm/include/asm/i8253.h | 2 --
arch/mips/include/asm/i8253.h | 2 --
arch/x86/include/asm/i8253.h | 2 --
include/linux/i8253.h | 4 ++++
4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/i8253.h b/arch/arm/include/asm/i8253.h
index 5b41b92..fee59eb 100644
--- a/arch/arm/include/asm/i8253.h
+++ b/arch/arm/include/asm/i8253.h
@@ -1,6 +1,4 @@
#ifndef __ASMARM_I8253_H
#define __ASMARM_I8253_H

-#define PIT_LATCH ((PIT_TICK_RATE + HZ / 2) / HZ)
-
#endif
diff --git a/arch/mips/include/asm/i8253.h b/arch/mips/include/asm/i8253.h
index 32ec1f0..26f4eb1 100644
--- a/arch/mips/include/asm/i8253.h
+++ b/arch/mips/include/asm/i8253.h
@@ -5,8 +5,6 @@
#ifndef __ASM_I8253_H
#define __ASM_I8253_H

-#define PIT_LATCH LATCH
-
extern void setup_pit_timer(void);

#endif /* __ASM_I8253_H */
diff --git a/arch/x86/include/asm/i8253.h b/arch/x86/include/asm/i8253.h
index 3d5f5ee..0049dc9 100644
--- a/arch/x86/include/asm/i8253.h
+++ b/arch/x86/include/asm/i8253.h
@@ -1,8 +1,6 @@
#ifndef _ASM_X86_I8253_H
#define _ASM_X86_I8253_H

-#define PIT_LATCH LATCH
-
extern void setup_pit_timer(void);

#endif /* _ASM_X86_I8253_H */
diff --git a/include/linux/i8253.h b/include/linux/i8253.h
index 13048d3..1ec6323 100644
--- a/include/linux/i8253.h
+++ b/include/linux/i8253.h
@@ -9,7 +9,9 @@
#ifndef __LINUX_I8253_H
#define __LINUX_I8253_H

+#include <linux/param.h>
#include <linux/spinlock.h>
+#include <linux/timex.h>
#include <asm/i8253.h>

/* i8253A PIT registers */
@@ -17,6 +19,8 @@
#define PIT_CH0 0x40
#define PIT_CH2 0x42

+#define PIT_LATCH ((PIT_TICK_RATE + HZ/2) / HZ)
+
#define inb_pit inb_p
#define outb_pit outb_p


\
 
 \ /
  Last update: 2011-06-09 15:11    [W:0.167 / U:0.528 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site