[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <938ce176eba8fdf4ecc41218712cc1dcd80def67.1298821856.git.epip@hera.kernel.org>
Date: Sun, 27 Feb 2011 15:59:37 +0000
From: Guan Xuetao <epip@...a.kernel.org>
To: arnd@...db.de
Cc: GuanXuetao <gxt@...c.pku.edu.cn>, linux-kernel@...r.kernel.org,
linux-arch@...r.kernel.org, greg@...ah.com
Subject: [PATCH 09/17] unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE
From: GuanXuetao <gxt@...c.pku.edu.cn>
for the term IOSPACE normally refers to the PCI PIO space
-- by advice with Arnd Bergmann
Signed-off-by: Guan Xuetao <gxt@...c.pku.edu.cn>
---
arch/unicore32/include/mach/PKUnity.h | 2 +-
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 fa11eba..940e9ed 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 3fb7236..c7d3dd6 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__
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists