diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-04-22 15:08:17 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-23 18:25:41 -0400 |
| commit | fdd8b079e33d4711527ace19798e9db99a056469 (patch) | |
| tree | 31c8f9d286dfb6fb8e7e306732cd51bea24d69a3 /arch/arm/mach-loki/addr-map.c | |
| parent | ae1036a2f4e8f83b544ddce4f875a1e4e2ac7b62 (diff) | |
[ARM] 5460/1: Orion: reduce namespace pollution
Symbols like SOFT_RESET are way too generic to be exported at large.
To avoid this, let's move the mbus bridge register defines into a
separate file and include it where needed. This affects mach-kirkwood,
mach-loki, mach-mv78xx0 and mach-orion5x simultaneously as they all
share code in plat-orion which relies on those defines.
Some other defines have been moved to narrower scopes, or simply deleted
when they had no user.
This fixes compilation problem with mpt2sas on the above listed
platforms.
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-loki/addr-map.c')
| -rw-r--r-- | arch/arm/mach-loki/addr-map.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-loki/addr-map.c b/arch/arm/mach-loki/addr-map.c index 0332d8f5c18c..b9537c97beba 100644 --- a/arch/arm/mach-loki/addr-map.c +++ b/arch/arm/mach-loki/addr-map.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | /* | 38 | /* |
| 39 | * CPU Address Decode Windows registers | 39 | * CPU Address Decode Windows registers |
| 40 | */ | 40 | */ |
| 41 | #define BRIDGE_REG(x) (BRIDGE_VIRT_BASE | (x)) | ||
| 41 | #define CPU_WIN_CTRL(n) BRIDGE_REG(0x000 | ((n) << 4)) | 42 | #define CPU_WIN_CTRL(n) BRIDGE_REG(0x000 | ((n) << 4)) |
| 42 | #define CPU_WIN_BASE(n) BRIDGE_REG(0x004 | ((n) << 4)) | 43 | #define CPU_WIN_BASE(n) BRIDGE_REG(0x004 | ((n) << 4)) |
| 43 | #define CPU_WIN_REMAP_LO(n) BRIDGE_REG(0x008 | ((n) << 4)) | 44 | #define CPU_WIN_REMAP_LO(n) BRIDGE_REG(0x008 | ((n) << 4)) |