From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759856Ab1FATtM (ORCPT ); Wed, 1 Jun 2011 15:49:12 -0400 Received: from h5.dl5rb.org.uk ([81.2.74.5]:59167 "EHLO duck.linux-mips.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759689Ab1FATrp (ORCPT ); Wed, 1 Jun 2011 15:47:45 -0400 Message-Id: <20110601180610.832810002@duck.linux-mips.net> User-Agent: quilt/0.48-1 Date: Wed, 01 Jun 2011 19:05:07 +0100 From: ralf@linux-mips.org To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Russell King , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org Subject: [patch 11/14] i8253: Consolidate definitions of PIT_LATCH References: <20110601180456.801265664@duck.linux-mips.net> Content-Disposition: inline; filename=i8253-sort-out-pit_latch-definitions.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org x86 defines PIT_LATCH as LATCH which in is defined as ((CLOCK_TICK_RATE + HZ/2) / HZ) and again defines CLOCK_TICK_RATE as PIT_TICK_RATE. MIPS defines PIT_LATCH as LATCH which in is defined as ((CLOCK_TICK_RATE + HZ/2) / HZ) and 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 . Signed-off-by: Ralf Baechle To: linux-kernel@vger.kernel.org Cc: Russell King Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" 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 #include +#include #include /* 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: ralf@linux-mips.org Subject: [patch 11/14] i8253: Consolidate definitions of PIT_LATCH Date: Wed, 01 Jun 2011 19:05:07 +0100 Message-ID: <20110601180610.832810002@duck.linux-mips.net> References: <20110601180456.801265664@duck.linux-mips.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline; filename=i8253-sort-out-pit_latch-definitions.patch List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: linux-mips@linux-mips.org, Russell King , x86@kernel.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , linux-arm-kernel@lists.infradead.org List-Id: linux-arch.vger.kernel.org x86 defines PIT_LATCH as LATCH which in is defined as ((CLOCK_TICK_RATE + HZ/2) / HZ) and again defines CLOCK_TICK_RATE as PIT_TICK_RATE. MIPS defines PIT_LATCH as LATCH which in is defined as ((CLOCK_TICK_RATE + HZ/2) / HZ) and 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 . Signed-off-by: Ralf Baechle To: linux-kernel@vger.kernel.org Cc: Russell King Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" 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 #include +#include #include /* 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: ralf@linux-mips.org (ralf at linux-mips.org) Date: Wed, 01 Jun 2011 19:05:07 +0100 Subject: [patch 11/14] i8253: Consolidate definitions of PIT_LATCH References: <20110601180456.801265664@duck.linux-mips.net> Message-ID: <20110601180610.832810002@duck.linux-mips.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org An embedded and charset-unspecified text was scrubbed... Name: i8253-sort-out-pit_latch-definitions.patch URL: