OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: Fix Versatile&Integrator includes to behave in the same way as Realview 

Realview doesn't include mach/platform.h in mach/hardware.h, so
make versatile behave in the same way.  Also, move the definition
of __io_address() into mach/hardware.h, just like Realview.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2010-01-14 19:59:37 +00:00
parent 28d7f4ec98
commit a285edcf18
11 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-integrator/core.c
View File

@ -24,6 +24,7 @@
#include <asm/clkdev.h>
#include <mach/clkdev.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/irq.h>
#include <asm/hardware/arm_timer.h>
#include <mach/cm.h>

1
arch/arm/mach-integrator/cpu.c
View File

@ -20,6 +20,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/mach-types.h>
#include <asm/hardware/icst525.h>

1
arch/arm/mach-integrator/include/mach/entry-macro.S
View File

@ -8,6 +8,7 @@
* warranty of any kind, whether express or implied.
*/
#include <mach/hardware.h>
#include <mach/platform.h>
#include <mach/irqs.h>
.macro disable_fiq

3
arch/arm/mach-integrator/include/mach/hardware.h
View File

@ -23,7 +23,6 @@
#define __ASM_ARCH_HARDWARE_H
#include <asm/sizes.h>
#include <mach/platform.h>
/*
* Where in virtual memory the IO devices (timers, system controllers
@ -48,5 +47,7 @@
#define PCIBIOS_MIN_IO 0x6000
#define PCIBIOS_MIN_MEM 0x00100000
#define __io_address(n) ((void __iomem *)IO_ADDRESS(n))
#endif

1
arch/arm/mach-integrator/integrator_ap.c
View File

@ -30,6 +30,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/param.h> /* HZ */

1
arch/arm/mach-integrator/integrator_cp.c
View File

@ -25,6 +25,7 @@
#include <asm/clkdev.h>
#include <mach/clkdev.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/mach-types.h>

1
arch/arm/mach-integrator/leds.c
View File

@ -27,6 +27,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/leds.h>
#include <asm/system.h>
#include <asm/mach-types.h>

1
arch/arm/mach-integrator/pci_v3.c
View File

@ -30,6 +30,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/irq.h>
#include <asm/signal.h>
#include <asm/system.h>

4
arch/arm/mach-versatile/core.c
View File

@ -35,7 +35,6 @@
#include <asm/clkdev.h>
#include <asm/system.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/leds.h>
#include <asm/hardware/arm_timer.h>
@ -48,6 +47,8 @@
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include "core.h"
#include "clock.h"
@ -58,7 +59,6 @@
*
* Setup a VA for the Versatile Vectored Interrupt Controller.
*/
#define __io_address(n) __io(IO_ADDRESS(n))
#define VA_VIC_BASE __io_address(VERSATILE_VIC_BASE)
#define VA_SIC_BASE __io_address(VERSATILE_SIC_BASE)

1
arch/arm/mach-versatile/include/mach/entry-macro.S
View File

@ -8,6 +8,7 @@
* warranty of any kind, whether express or implied.
*/
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/hardware/vic.h>
.macro disable_fiq

3
arch/arm/mach-versatile/include/mach/hardware.h
View File

@ -23,7 +23,6 @@
#define __ASM_ARCH_HARDWARE_H
#include <asm/sizes.h>
#include <mach/platform.h>
/*
* PCI space virtual addresses
@ -49,4 +48,6 @@
/* macro to get at IO space when running virtually */
#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
#define __io_address(n) __io(IO_ADDRESS(n))
#endif