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 12/14] i8253: Move remaining content and delete <asm/i8253.h> Date: Wed, 01 Jun 2011 19:05:08 +0100 [thread overview] Message-ID: <20110601180610.913463093@duck.linux-mips.net> (raw) In-Reply-To: 20110601180456.801265664@duck.linux-mips.net [-- Attachment #1: i8253-sort-remaining-definitions.patch --] [-- Type: text/plain, Size: 3092 bytes --] There is no really good other place but one line for two out of three architectures that have a <asm/i8253.h> file doesn't justify this files existence. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-mips@linux-mips.org Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: x86@kernel.org arch/arm/include/asm/i8253.h | 4 ---- arch/mips/include/asm/i8253.h | 10 ---------- arch/mips/include/asm/time.h | 5 +++++ arch/x86/include/asm/i8253.h | 6 ------ arch/x86/include/asm/time.h | 1 + include/linux/i8253.h | 1 - 6 files changed, 6 insertions(+), 21 deletions(-) Index: linux-i8253/arch/x86/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/x86/include/asm/i8253.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_X86_I8253_H -#define _ASM_X86_I8253_H - -extern void setup_pit_timer(void); - -#endif /* _ASM_X86_I8253_H */ Index: linux-i8253/include/linux/i8253.h =================================================================== --- linux-i8253.orig/include/linux/i8253.h +++ linux-i8253/include/linux/i8253.h @@ -12,7 +12,6 @@ #include <linux/param.h> #include <linux/spinlock.h> #include <linux/timex.h> -#include <asm/i8253.h> /* i8253A PIT registers */ #define PIT_MODE 0x43 Index: linux-i8253/arch/x86/include/asm/time.h =================================================================== --- linux-i8253.orig/arch/x86/include/asm/time.h +++ linux-i8253/arch/x86/include/asm/time.h @@ -6,6 +6,7 @@ extern void hpet_time_init(void); extern void time_init(void); +extern void setup_pit_timer(void); extern struct clock_event_device *global_clock_event; Index: linux-i8253/arch/mips/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/mips/include/asm/i8253.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Machine specific IO port address definition for generic. - * Written by Osamu Tomita <tomita@cinet.co.jp> - */ -#ifndef __ASM_I8253_H -#define __ASM_I8253_H - -extern void setup_pit_timer(void); - -#endif /* __ASM_I8253_H */ Index: linux-i8253/arch/arm/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/arm/include/asm/i8253.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __ASMARM_I8253_H -#define __ASMARM_I8253_H - -#endif Index: linux-i8253/arch/mips/include/asm/time.h =================================================================== --- linux-i8253.orig/arch/mips/include/asm/time.h +++ linux-i8253/arch/mips/include/asm/time.h @@ -36,6 +36,11 @@ extern int rtc_mips_set_mmss(unsigned lo extern void plat_time_init(void); /* + * Initialize i8253 / i8254 PIT clockevent device. + */ +extern void setup_pit_timer(void); + +/* * mips_hpt_frequency - must be set if you intend to use an R4k-compatible * counter as a timer interrupt source. */
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: linux-arm-kernel@lists.infradead.org, Russell King <linux@arm.linux.org.uk>, linux-mips@linux-mips.org, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org Subject: [patch 12/14] i8253: Move remaining content and delete <asm/i8253.h> Date: Wed, 01 Jun 2011 19:05:08 +0100 [thread overview] Message-ID: <20110601180610.913463093@duck.linux-mips.net> (raw) Message-ID: <20110601180508.Nb2XkrbQPdeCiB-JTOHneePmsomSpHb9CcE0ijUzh1w@z> (raw) In-Reply-To: 20110601180456.801265664@duck.linux-mips.net [-- Attachment #1: i8253-sort-remaining-definitions.patch --] [-- Type: text/plain, Size: 3094 bytes --] There is no really good other place but one line for two out of three architectures that have a <asm/i8253.h> file doesn't justify this files existence. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-mips@linux-mips.org Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: x86@kernel.org arch/arm/include/asm/i8253.h | 4 ---- arch/mips/include/asm/i8253.h | 10 ---------- arch/mips/include/asm/time.h | 5 +++++ arch/x86/include/asm/i8253.h | 6 ------ arch/x86/include/asm/time.h | 1 + include/linux/i8253.h | 1 - 6 files changed, 6 insertions(+), 21 deletions(-) Index: linux-i8253/arch/x86/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/x86/include/asm/i8253.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_X86_I8253_H -#define _ASM_X86_I8253_H - -extern void setup_pit_timer(void); - -#endif /* _ASM_X86_I8253_H */ Index: linux-i8253/include/linux/i8253.h =================================================================== --- linux-i8253.orig/include/linux/i8253.h +++ linux-i8253/include/linux/i8253.h @@ -12,7 +12,6 @@ #include <linux/param.h> #include <linux/spinlock.h> #include <linux/timex.h> -#include <asm/i8253.h> /* i8253A PIT registers */ #define PIT_MODE 0x43 Index: linux-i8253/arch/x86/include/asm/time.h =================================================================== --- linux-i8253.orig/arch/x86/include/asm/time.h +++ linux-i8253/arch/x86/include/asm/time.h @@ -6,6 +6,7 @@ extern void hpet_time_init(void); extern void time_init(void); +extern void setup_pit_timer(void); extern struct clock_event_device *global_clock_event; Index: linux-i8253/arch/mips/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/mips/include/asm/i8253.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Machine specific IO port address definition for generic. - * Written by Osamu Tomita <tomita@cinet.co.jp> - */ -#ifndef __ASM_I8253_H -#define __ASM_I8253_H - -extern void setup_pit_timer(void); - -#endif /* __ASM_I8253_H */ Index: linux-i8253/arch/arm/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/arm/include/asm/i8253.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __ASMARM_I8253_H -#define __ASMARM_I8253_H - -#endif Index: linux-i8253/arch/mips/include/asm/time.h =================================================================== --- linux-i8253.orig/arch/mips/include/asm/time.h +++ linux-i8253/arch/mips/include/asm/time.h @@ -36,6 +36,11 @@ extern int rtc_mips_set_mmss(unsigned lo extern void plat_time_init(void); /* + * Initialize i8253 / i8254 PIT clockevent device. + */ +extern void setup_pit_timer(void); + +/* * mips_hpt_frequency - must be set if you intend to use an R4k-compatible * counter as a timer interrupt source. */
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 ` [patch 11/14] i8253: Consolidate definitions of PIT_LATCH ralf 2011-06-01 18:05 ` ralf 2011-06-01 18:05 ` ralf [this message] 2011-06-01 18:05 ` [patch 12/14] i8253: Move remaining content and delete <asm/i8253.h> 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.913463093@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: linkBe 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).