Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb2455aa authored by Ralf Baechle's avatar Ralf Baechle Committed by Thomas Gleixner
Browse files

i8253: Unify all kernel declarations of i8253_lock 



Signed-off-by: default avatarRalf 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.134151920@duck.linux-mips.net


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 334955ef

arch/arm/include/asm/i8253.h

+0 −9
Original line number Diff line number Diff line 
#ifndef __ASMARM_I8253_H

#define __ASMARM_I8253_H



/* i8253A PIT registers */

#define PIT_MODE	0x43

#define PIT_CH0		0x40



#define PIT_LATCH	((PIT_TICK_RATE + HZ / 2) / HZ)



extern raw_spinlock_t i8253_lock;



#define outb_pit	outb_p

#define inb_pit		inb_p



#endif

arch/mips/include/asm/i8253.h

+0 −12
Original line number Diff line number Diff line
@@ -5,20 +5,8 @@ 
#ifndef __ASM_I8253_H

#define __ASM_I8253_H



#include <linux/spinlock.h>



/* i8253A PIT registers */

#define PIT_MODE		0x43

#define PIT_CH0			0x40

#define PIT_CH2			0x42



#define PIT_LATCH		LATCH



extern raw_spinlock_t i8253_lock;



extern void setup_pit_timer(void);



#define inb_pit inb_p

#define outb_pit outb_p



#endif /* __ASM_I8253_H */

arch/x86/include/asm/i8253.h

+0 −10
Original line number Diff line number Diff line 
#ifndef _ASM_X86_I8253_H

#define _ASM_X86_I8253_H



/* i8253A PIT registers */

#define PIT_MODE		0x43

#define PIT_CH0			0x40

#define PIT_CH2			0x42



#define PIT_LATCH	LATCH



extern raw_spinlock_t i8253_lock;



extern struct clock_event_device *global_clock_event;



extern void setup_pit_timer(void);



#define inb_pit		inb_p

#define outb_pit	outb_p



#endif /* _ASM_X86_I8253_H */

include/linux/i8253.h

+14 −0
Original line number Diff line number Diff line
@@ -2,10 +2,24 @@ 
 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 *  Machine specific IO port address definition for generic.

 *  Written by Osamu Tomita <tomita@cinet.co.jp>

 */

#ifndef __LINUX_I8253_H

#define __LINUX_I8253_H



#include <linux/spinlock.h>

#include <asm/i8253.h>



/* i8253A PIT registers */

#define PIT_MODE	0x43

#define PIT_CH0		0x40

#define PIT_CH2		0x42



#define inb_pit         inb_p

#define outb_pit        outb_p



extern raw_spinlock_t i8253_lock;



#endif /* __LINUX_I8253_H */