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

Commit bcbbf908 authored by Russell King's avatar Russell King
Browse files

ARM: ebsa110: move platform definitions out of mach/hardware.h 



Stop exposing platform definitions to the entire kernel tree, move
them into a private header file instead.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 62aa2b53

arch/arm/mach-ebsa110/core.c

+1 −4
Original line number Diff line number Diff line
@@ -30,10 +30,7 @@ 


#include <asm/mach/time.h>



#define IRQ_MASK		0xfe000000	/* read */

#define IRQ_MSET		0xfe000000	/* write */

#define IRQ_STAT		0xff000000	/* read */

#define IRQ_MCLR		0xff000000	/* write */

#include "core.h"



static void ebsa110_mask_irq(struct irq_data *d)

{

arch/arm/mach-ebsa110/core.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 1996-2000 Russell King.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This file contains the core hardware definitions of the EBSA-110.

 */

#ifndef CORE_H

#define CORE_H



/* Physical addresses/sizes */

#define ISAMEM_PHYS		0xe0000000

#define ISAMEM_SIZE		0x10000000



#define ISAIO_PHYS		0xf0000000

#define ISAIO_SIZE		PGDIR_SIZE



#define TRICK0_PHYS		0xf2000000

#define TRICK1_PHYS		0xf2400000

#define TRICK2_PHYS		0xf2800000

#define TRICK3_PHYS		0xf2c00000

#define TRICK4_PHYS		0xf3000000

#define TRICK5_PHYS		0xf3400000

#define TRICK6_PHYS		0xf3800000

#define TRICK7_PHYS		0xf3c00000



/* Virtual addresses */

#define PIT_BASE		0xfc000000	/* trick 0 */

#define SOFT_BASE		0xfd000000	/* trick 1 */

#define IRQ_MASK		0xfe000000	/* trick 3 - read */

#define IRQ_MSET		0xfe000000	/* trick 3 - write */

#define IRQ_STAT		0xff000000	/* trick 4 - read */

#define IRQ_MCLR		0xff000000	/* trick 4 - write */



#endif

arch/arm/mach-ebsa110/include/mach/hardware.h

+0 −39
Original line number Diff line number Diff line
@@ -12,48 +12,9 @@ 
#ifndef __ASM_ARCH_HARDWARE_H

#define __ASM_ARCH_HARDWARE_H



/*

 * The EBSA110 has a weird "ISA IO" region:

 *

 * Region 0 (addr = 0xf0000000 + io << 2)

 * --------------------------------------------------------

 * Physical region	IO region

 * f0000fe0 - f0000ffc	3f8 - 3ff  ttyS0

 * f0000e60 - f0000e64	398 - 399

 * f0000de0 - f0000dfc	378 - 37f  lp0

 * f0000be0 - f0000bfc	2f8 - 2ff  ttyS1

 *

 * Region 1 (addr = 0xf0000000 + (io & ~1) << 1 + (io & 1))

 * --------------------------------------------------------

 * Physical region	IO region

 * f00014f1             a79        pnp write data

 * f00007c0 - f00007c1	3e0 - 3e1  pcmcia

 * f00004f1		279        pnp address

 * f0000440 - f000046c  220 - 236  eth0

 * f0000405		203        pnp read data

 */



#define ISAMEM_PHYS		0xe0000000

#define ISAMEM_SIZE		0x10000000



#define ISAIO_PHYS		0xf0000000

#define ISAIO_SIZE		PGDIR_SIZE



#define TRICK0_PHYS		0xf2000000

#define TRICK1_PHYS		0xf2400000

#define TRICK2_PHYS		0xf2800000

#define TRICK3_PHYS		0xf2c00000

#define TRICK4_PHYS		0xf3000000

#define TRICK5_PHYS		0xf3400000

#define TRICK6_PHYS		0xf3800000

#define TRICK7_PHYS		0xf3c00000



#define ISAMEM_BASE		0xe0000000

#define ISAIO_BASE		0xf0000000



#define PIT_BASE		0xfc000000

#define SOFT_BASE		0xfd000000



/*

 * RAM definitions

 */

arch/arm/mach-ebsa110/io.c

+20 −0
Original line number Diff line number Diff line
@@ -177,6 +177,26 @@ void writesl(void __iomem *addr, const void *data, int len) 
}

EXPORT_SYMBOL(writesl);



/*

 * The EBSA110 has a weird "ISA IO" region:

 *

 * Region 0 (addr = 0xf0000000 + io << 2)

 * --------------------------------------------------------

 * Physical region	IO region

 * f0000fe0 - f0000ffc	3f8 - 3ff  ttyS0

 * f0000e60 - f0000e64	398 - 399

 * f0000de0 - f0000dfc	378 - 37f  lp0

 * f0000be0 - f0000bfc	2f8 - 2ff  ttyS1

 *

 * Region 1 (addr = 0xf0000000 + (io & ~1) << 1 + (io & 1))

 * --------------------------------------------------------

 * Physical region	IO region

 * f00014f1             a79        pnp write data

 * f00007c0 - f00007c1	3e0 - 3e1  pcmcia

 * f00004f1		279        pnp address

 * f0000440 - f000046c  220 - 236  eth0

 * f0000405		203        pnp read data

 */

#define SUPERIO_PORT(p) \

	(((p) >> 3) == (0x3f8 >> 3) || \

	 ((p) >> 3) == (0x2f8 >> 3) || \

arch/arm/mach-ebsa110/leds.c

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <asm/system.h>

#include <asm/mach-types.h>



#include "core.h"



static spinlock_t leds_lock;



static void ebsa110_leds_event(led_event_t ledevt)