diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-17 20:23:57 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 09:35:28 +0100 |
| commit | 7d60a044c8226d86fa93c2cf90ccdb97e3ba28fa (patch) | |
| tree | b4457af41eb2d1141a448f7ad0e72b059b8f08eb /arch/arm/mach-integrator | |
| parent | da7ba956c84d3c85c5ec619af794a6ca0ee3faae (diff) | |
| download | talos-op-linux-7d60a044c8226d86fa93c2cf90ccdb97e3ba28fa.tar.gz talos-op-linux-7d60a044c8226d86fa93c2cf90ccdb97e3ba28fa.zip | |
ARM: Integrator: allow IO_ADDRESS() to be used for register addresses
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/hardware.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-integrator/include/mach/hardware.h b/arch/arm/mach-integrator/include/mach/hardware.h index d44af7209b48..8e26360ce9a3 100644 --- a/arch/arm/mach-integrator/include/mach/hardware.h +++ b/arch/arm/mach-integrator/include/mach/hardware.h @@ -35,18 +35,18 @@ #define PCIO_BASE PCI_IO_VADDR #define PCIMEM_BASE PCI_MEMORY_VADDR -#ifdef CONFIG_MMU -/* macro to get at IO space when running virtually */ -#define IO_ADDRESS(x) (((x) >> 4) + IO_BASE) -#else -#define IO_ADDRESS(x) (x) -#endif - #define pcibios_assign_all_busses() 1 #define PCIBIOS_MIN_IO 0x6000 #define PCIBIOS_MIN_MEM 0x00100000 +/* macro to get at IO space when running virtually */ +#ifdef CONFIG_MMU +#define IO_ADDRESS(x) (((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE) +#else +#define IO_ADDRESS(x) (x) +#endif + #define __io_address(n) ((void __iomem *)IO_ADDRESS(n)) #endif |
