unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs

[~andy/linux] / arch / unicore32 / include / mach / regs-ac97.h

diff --git a/arch/unicore32/include/mach/regs-ac97.h b/arch/unicore32/include/mach/regs-ac97.h
index ce299bf4adae227e82fcf4d86edca6bedfa1772b..b7563e9d65035be409221f37bc289a2f7199f297 100644 (file)
--- a/arch/unicore32/include/mach/regs-ac97.h
+++ b/arch/unicore32/include/mach/regs-ac97.h
@@ -2,16 +2,16 @@
  * PKUnity AC97 Registers
  */
 
-#define PKUNITY_AC97_CONR              __REG(PKUNITY_AC97_BASE + 0x0000)
-#define PKUNITY_AC97_OCR               __REG(PKUNITY_AC97_BASE + 0x0004)
-#define PKUNITY_AC97_ICR               __REG(PKUNITY_AC97_BASE + 0x0008)
-#define PKUNITY_AC97_CRAC              __REG(PKUNITY_AC97_BASE + 0x000C)
-#define PKUNITY_AC97_INTR              __REG(PKUNITY_AC97_BASE + 0x0010)
-#define PKUNITY_AC97_INTRSTAT          __REG(PKUNITY_AC97_BASE + 0x0014)
-#define PKUNITY_AC97_INTRCLEAR         __REG(PKUNITY_AC97_BASE + 0x0018)
-#define PKUNITY_AC97_ENABLE            __REG(PKUNITY_AC97_BASE + 0x001C)
-#define PKUNITY_AC97_OUT_FIFO          __REG(PKUNITY_AC97_BASE + 0x0020)
-#define PKUNITY_AC97_IN_FIFO           __REG(PKUNITY_AC97_BASE + 0x0030)
+#define PKUNITY_AC97_CONR              (PKUNITY_AC97_BASE + 0x0000)
+#define PKUNITY_AC97_OCR               (PKUNITY_AC97_BASE + 0x0004)
+#define PKUNITY_AC97_ICR               (PKUNITY_AC97_BASE + 0x0008)
+#define PKUNITY_AC97_CRAC              (PKUNITY_AC97_BASE + 0x000C)
+#define PKUNITY_AC97_INTR              (PKUNITY_AC97_BASE + 0x0010)
+#define PKUNITY_AC97_INTRSTAT          (PKUNITY_AC97_BASE + 0x0014)
+#define PKUNITY_AC97_INTRCLEAR         (PKUNITY_AC97_BASE + 0x0018)
+#define PKUNITY_AC97_ENABLE            (PKUNITY_AC97_BASE + 0x001C)
+#define PKUNITY_AC97_OUT_FIFO          (PKUNITY_AC97_BASE + 0x0020)
+#define PKUNITY_AC97_IN_FIFO           (PKUNITY_AC97_BASE + 0x0030)
 
 #define AC97_CODEC_REG(v)               FIELD((v), 7, 16)
 #define AC97_CODEC_VAL(v)               FIELD((v), 16, 0)