diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-02-28 13:15:43 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-07-26 09:09:58 -0500 |
| commit | c04dc9a6bfe88b8c15bf8dd298fc24d6b9df3f22 (patch) | |
| tree | 31710d95a5f232ef04f1a51b69f8288cfbec325e /arch/arm/mach-shark/include/mach | |
| parent | 29d396047939c559dc1fd42f2d43fd6006082b07 (diff) | |
| download | blackbird-op-linux-c04dc9a6bfe88b8c15bf8dd298fc24d6b9df3f22.tar.gz blackbird-op-linux-c04dc9a6bfe88b8c15bf8dd298fc24d6b9df3f22.zip | |
ARM: shark: use fixed PCI i/o mapping
Convert shark to use the fixed i/o mapping and remove io.h.
This shrinks the mapping from 256MB to 1MB, but nothing is using that much
space AFAICT.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shark/include/mach')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/debug-macro.S | 7 | ||||
| -rw-r--r-- | arch/arm/mach-shark/include/mach/entry-macro.S | 3 | ||||
| -rw-r--r-- | arch/arm/mach-shark/include/mach/io.h | 18 |
3 files changed, 6 insertions, 22 deletions
diff --git a/arch/arm/mach-shark/include/mach/debug-macro.S b/arch/arm/mach-shark/include/mach/debug-macro.S index 20eb2bf2a42b..d129119a3f69 100644 --- a/arch/arm/mach-shark/include/mach/debug-macro.S +++ b/arch/arm/mach-shark/include/mach/debug-macro.S @@ -12,9 +12,10 @@ */ .macro addruart, rp, rv, tmp - mov \rp, #0xe0000000 - orr \rp, \rp, #0x000003f8 - mov \rv, \rp + mov \rp, #0x3f8 + orr \rv, \rp, #0xfe000000 + orr \rv, \rv, #0x00e00000 + orr \rp, \rp, #0x40000000 .endm .macro senduart,rd,rx diff --git a/arch/arm/mach-shark/include/mach/entry-macro.S b/arch/arm/mach-shark/include/mach/entry-macro.S index 5901b09fc96a..c9e49f049532 100644 --- a/arch/arm/mach-shark/include/mach/entry-macro.S +++ b/arch/arm/mach-shark/include/mach/entry-macro.S @@ -8,7 +8,8 @@ * warranty of any kind, whether express or implied. */ .macro get_irqnr_preamble, base, tmp - mov \base, #0xe0000000 + mov \base, #0xfe000000 + orr \base, \base, #0x00e00000 .endm .macro get_irqnr_and_base, irqnr, irqstat, base, tmp diff --git a/arch/arm/mach-shark/include/mach/io.h b/arch/arm/mach-shark/include/mach/io.h deleted file mode 100644 index 1a45fc01ff1d..000000000000 --- a/arch/arm/mach-shark/include/mach/io.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * arch/arm/mach-shark/include/mach/io.h - * - * by Alexander Schulz - * - * derived from: - * arch/arm/mach-ebsa110/include/mach/io.h - * Copyright (C) 1997,1998 Russell King - */ - -#ifndef __ASM_ARM_ARCH_IO_H -#define __ASM_ARM_ARCH_IO_H - -#define IO_SPACE_LIMIT 0xffffffff - -#define __io(a) ((void __iomem *)(0xe0000000 + (a))) - -#endif |
