diff options
| author | GuanXuetao <gxt@mprc.pku.edu.cn> | 2011-02-26 20:49:47 +0800 |
|---|---|---|
| committer | GuanXuetao <gxt@mprc.pku.edu.cn> | 2011-03-17 09:19:17 +0800 |
| commit | bd42aa75b4231b5fd3742de4c4b84ad590a7d654 (patch) | |
| tree | 1fdf89c7b05fbd48d2fdd3f414ae902cb8059946 | |
| parent | 36a8b8c399480b5388ddd198ead78c9dd0e50df0 (diff) | |
unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE
for the term IOSPACE normally refers to the PCI PIO space
-- by advice with Arnd Bergmann
Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| -rw-r--r-- | arch/unicore32/include/mach/PKUnity.h | 2 | ||||
| -rw-r--r-- | arch/unicore32/include/mach/hardware.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/unicore32/include/mach/PKUnity.h b/arch/unicore32/include/mach/PKUnity.h index fa11eba0afd..940e9ed0941 100644 --- a/arch/unicore32/include/mach/PKUnity.h +++ b/arch/unicore32/include/mach/PKUnity.h @@ -21,7 +21,7 @@ * Memory Definitions */ #define PKUNITY_SDRAM_BASE 0x00000000 /* 0x00000000 - 0x7FFFFFFF 2GB */ -#define PKUNITY_IOSPACE_BASE 0x80000000 /* 0x80000000 - 0xFFFFFFFF 2GB */ +#define PKUNITY_MMIO_BASE 0x80000000 /* 0x80000000 - 0xFFFFFFFF 2GB */ #define PKUNITY_PCI_BASE 0x80000000 /* 0x80000000 - 0xBFFFFFFF 1GB */ #include "regs-pci.h" #define PKUNITY_BOOT_ROM2_BASE 0xF4000000 /* 0xF4000000 - 0xF7FFFFFF 64MB */ diff --git a/arch/unicore32/include/mach/hardware.h b/arch/unicore32/include/mach/hardware.h index 3fb7236f8d6..c7d3dd6b4ef 100644 --- a/arch/unicore32/include/mach/hardware.h +++ b/arch/unicore32/include/mach/hardware.h @@ -17,8 +17,8 @@ #include "PKUnity.h" -#define io_p2v(x) ((x) - PKUNITY_IOSPACE_BASE) -#define io_v2p(x) ((x) + PKUNITY_IOSPACE_BASE) +#define io_p2v(x) ((x) - PKUNITY_MMIO_BASE) +#define io_v2p(x) ((x) + PKUNITY_MMIO_BASE) #ifndef __ASSEMBLY__ |