From: ralf@linux-mips.org
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Cc: linux-mips@linux-mips.org, Russell King <linux@arm.linux.org.uk>,
x86@kernel.org, Ingo Molnar <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org
Subject: [patch 11/14] i8253: Consolidate definitions of PIT_LATCH
Date: Wed, 01 Jun 2011 19:05:07 +0100 [thread overview]
Message-ID: <20110601180610.832810002@duck.linux-mips.net> (raw)
In-Reply-To: 20110601180456.801265664@duck.linux-mips.net
[-- Attachment #1: i8253-sort-out-pit_latch-definitions.patch --]
[-- Type: text/plain, Size: 2711 bytes --]
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>
To: linux-kernel@vger.kernel.org
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
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(-)
Index: linux-mips/arch/arm/include/asm/i8253.h
===================================================================
--- linux-mips.orig/arch/arm/include/asm/i8253.h
+++ linux-mips/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
Index: linux-mips/arch/mips/include/asm/i8253.h
===================================================================
--- linux-mips.orig/arch/mips/include/asm/i8253.h
+++ linux-mips/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 */
Index: linux-mips/arch/x86/include/asm/i8253.h
===================================================================
--- linux-mips.orig/arch/x86/include/asm/i8253.h
+++ linux-mips/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 */
Index: linux-mips/include/linux/i8253.h
===================================================================
--- linux-mips.orig/include/linux/i8253.h
+++ linux-mips/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
WARNING: multiple messages have this Message-ID (diff)
From: ralf@linux-mips.org
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Russell King <linux@arm.linux.org.uk>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-mips@linux-mips.org
Subject: [patch 11/14] i8253: Consolidate definitions of PIT_LATCH
Date: Wed, 01 Jun 2011 19:05:07 +0100 [thread overview]
Message-ID: <20110601180610.832810002@duck.linux-mips.net> (raw)
Message-ID: <20110601180507.MMx0OfLPAkcnAlyPKWfvMJpKu7GBYAsioWxxMiqoAV0@z> (raw)
In-Reply-To: 20110601180456.801265664@duck.linux-mips.net
[-- Attachment #1: i8253-sort-out-pit_latch-definitions.patch --]
[-- Type: text/plain, Size: 2715 bytes --]
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>
To: linux-kernel@vger.kernel.org
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
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(-)
Index: linux-mips/arch/arm/include/asm/i8253.h
===================================================================
--- linux-mips.orig/arch/arm/include/asm/i8253.h
+++ linux-mips/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
Index: linux-mips/arch/mips/include/asm/i8253.h
===================================================================
--- linux-mips.orig/arch/mips/include/asm/i8253.h
+++ linux-mips/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 */
Index: linux-mips/arch/x86/include/asm/i8253.h
===================================================================
--- linux-mips.orig/arch/x86/include/asm/i8253.h
+++ linux-mips/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 */
Index: linux-mips/include/linux/i8253.h
===================================================================
--- linux-mips.orig/include/linux/i8253.h
+++ linux-mips/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
next prev parent reply other threads:[~2011-06-01 18:05 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 18:04 [patch 00/14] Sort out i8253 and PC speaker locking and headers ralf
2011-06-01 18:04 ` ralf
2011-06-01 18:04 ` [patch 01/14] i8253: Create <linux/i8253.h> and make all in kernel users to use it ralf
2011-06-01 18:04 ` ralf
2011-06-01 18:04 ` [patch 02/14] i8253: Unify all kernel declarations of i8253_lock in <linux/i8253.h> ralf
2011-06-01 18:04 ` ralf
2011-06-01 18:04 ` [patch 03/14] i8253: Consolidate all kernel definitions of i8253_lock in lib/i8253-lock.c ralf
2011-06-01 18:05 ` [patch 04/14] i8253: Make MIPS use the shared i8253_lock ralf
2011-06-01 18:05 ` [patch 05/14] i8253: Make x86 " ralf
2011-06-01 18:05 ` [patch 06/14] i8253: Make pcspkr input driver " ralf
2011-06-01 18:05 ` ralf
2011-06-01 18:05 ` [patch 07/14] i8253: Make pcsp sound " ralf
2011-06-01 18:05 ` ralf
2011-06-03 9:53 ` Takashi Iwai
2011-06-03 9:53 ` [alsa-devel] " Takashi Iwai
2011-06-01 18:05 ` [patch 08/14] i8253: Alpha: Cleanup remaining users of i8253pit.h ralf
2011-06-01 18:05 ` ralf
2011-06-01 18:05 ` [patch 09/14] i8253: Alpha, PowerPC: Remove unused <asm/8253pit.h> header ralf
2011-06-01 18:05 ` ralf
2011-06-09 5:07 ` Benjamin Herrenschmidt
2011-06-09 5:07 ` Benjamin Herrenschmidt
2011-06-01 18:05 ` [patch 10/14] i8253: x86: Consolidate definitions of global_clock_event ralf
2011-06-01 18:05 ` ralf
2011-06-01 18:05 ` ralf [this message]
2011-06-01 18:05 ` [patch 11/14] i8253: Consolidate definitions of PIT_LATCH ralf
2011-06-01 18:05 ` [patch 12/14] i8253: Move remaining content and delete <asm/i8253.h> ralf
2011-06-01 18:05 ` ralf
2011-06-02 11:29 ` Sergei Shtylyov
2011-06-01 18:05 ` [patch 13/14] PCSPKR: Cleanup Kconfig dependencies ralf
2011-06-01 18:05 ` ralf
2011-06-09 5:09 ` Benjamin Herrenschmidt
2011-06-09 5:09 ` Benjamin Herrenschmidt
2011-06-01 18:05 ` [patch 14/14] PCSPKR: MIPS: Make config dependencies finer grained ralf
2011-06-01 18:05 ` ralf
2011-06-02 19:11 ` [patch 00/14] Sort out i8253 and PC speaker locking and headers Gerhard Pircher
2011-06-02 19:11 ` Gerhard Pircher
2011-06-03 18:00 ` Ralf Baechle
2011-06-03 18:00 ` Ralf Baechle
2011-06-03 19:22 ` Gerhard Pircher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110601180610.832810002@duck.linux-mips.net \
--to=ralf@linux-mips.org \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux@arm.linux.org.uk \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).