1 files changed, 29 insertions, 28 deletions
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 792037069226..162121842a2b 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -29,45 +29,46 @@
 #include <mach/pm-rmobile.h>
 /* DBG */
-#define DBGREG1 0xe6100020
+#define DBGREG1 IOMEM(0xe6100020)
-#define DBGREG9 0xe6100040
+#define DBGREG9 IOMEM(0xe6100040)
 /* CPGA */
-#define SYSTBCR 0xe6150024
+#define SYSTBCR IOMEM(0xe6150024)
-#define MSTPSR0 0xe6150030
+#define MSTPSR0 IOMEM(0xe6150030)
-#define MSTPSR1 0xe6150038
+#define MSTPSR1 IOMEM(0xe6150038)
-#define MSTPSR2 0xe6150040
+#define MSTPSR2 IOMEM(0xe6150040)
-#define MSTPSR3 0xe6150048
+#define MSTPSR3 IOMEM(0xe6150048)
-#define MSTPSR4 0xe615004c
+#define MSTPSR4 IOMEM(0xe615004c)
-#define PLLC01STPCR 0xe61500c8
+#define PLLC01STPCR IOMEM(0xe61500c8)
 /* SYSC */
-#define SBAR 0xe6180020
+#define SBAR IOMEM(0xe6180020)
-#define WUPRMSK 0xe6180028
+#define WUPRMSK IOMEM(0xe6180028)
-#define WUPSMSK 0xe618002c
+#define WUPSMSK IOMEM(0xe618002c)
-#define WUPSMSK2 0xe6180048
+#define WUPSMSK2 IOMEM(0xe6180048)
-#define WUPSFAC 0xe6180098
+#define WUPSFAC IOMEM(0xe6180098)
-#define IRQCR 0xe618022c
+#define IRQCR IOMEM(0xe618022c)
-#define IRQCR2 0xe6180238
+#define IRQCR2 IOMEM(0xe6180238)
-#define IRQCR3 0xe6180244
+#define IRQCR3 IOMEM(0xe6180244)
-#define IRQCR4 0xe6180248
+#define IRQCR4 IOMEM(0xe6180248)
-#define PDNSEL 0xe6180254
+#define PDNSEL IOMEM(0xe6180254)
 /* INTC */
-#define ICR1A 0xe6900000
+#define ICR1A IOMEM(0xe6900000)
-#define ICR2A 0xe6900004
+#define ICR2A IOMEM(0xe6900004)
-#define ICR3A 0xe6900008
+#define ICR3A IOMEM(0xe6900008)
-#define ICR4A 0xe690000c
+#define ICR4A IOMEM(0xe690000c)
-#define INTMSK00A 0xe6900040
+#define INTMSK00A IOMEM(0xe6900040)
-#define INTMSK10A 0xe6900044
+#define INTMSK10A IOMEM(0xe6900044)
-#define INTMSK20A 0xe6900048
+#define INTMSK20A IOMEM(0xe6900048)
-#define INTMSK30A 0xe690004c
+#define INTMSK30A IOMEM(0xe690004c)
 /* MFIS */
+/* FIXME: pointing where? */
 #define SMFRAM 0xe6a70000
 /* AP-System Core */
-#define APARMBAREA 0xe6f10020
+#define APARMBAREA IOMEM(0xe6f10020)
 #ifdef CONFIG_PM

diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index 792037069226..162121842a2b 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -29,45 +29,46 @@
29	#include <mach/pm-rmobile.h>	29	#include <mach/pm-rmobile.h>
30		30
31	/* DBG */	31	/* DBG */
32	#define DBGREG1 0xe6100020	32	#define DBGREG1 IOMEM(0xe6100020)
33	#define DBGREG9 0xe6100040	33	#define DBGREG9 IOMEM(0xe6100040)
34		34
35	/* CPGA */	35	/* CPGA */
36	#define SYSTBCR 0xe6150024	36	#define SYSTBCR IOMEM(0xe6150024)
37	#define MSTPSR0 0xe6150030	37	#define MSTPSR0 IOMEM(0xe6150030)
38	#define MSTPSR1 0xe6150038	38	#define MSTPSR1 IOMEM(0xe6150038)
39	#define MSTPSR2 0xe6150040	39	#define MSTPSR2 IOMEM(0xe6150040)
40	#define MSTPSR3 0xe6150048	40	#define MSTPSR3 IOMEM(0xe6150048)
41	#define MSTPSR4 0xe615004c	41	#define MSTPSR4 IOMEM(0xe615004c)
42	#define PLLC01STPCR 0xe61500c8	42	#define PLLC01STPCR IOMEM(0xe61500c8)
43		43
44	/* SYSC */	44	/* SYSC */
45	#define SBAR 0xe6180020	45	#define SBAR IOMEM(0xe6180020)
46	#define WUPRMSK 0xe6180028	46	#define WUPRMSK IOMEM(0xe6180028)
47	#define WUPSMSK 0xe618002c	47	#define WUPSMSK IOMEM(0xe618002c)
48	#define WUPSMSK2 0xe6180048	48	#define WUPSMSK2 IOMEM(0xe6180048)
49	#define WUPSFAC 0xe6180098	49	#define WUPSFAC IOMEM(0xe6180098)
50	#define IRQCR 0xe618022c	50	#define IRQCR IOMEM(0xe618022c)
51	#define IRQCR2 0xe6180238	51	#define IRQCR2 IOMEM(0xe6180238)
52	#define IRQCR3 0xe6180244	52	#define IRQCR3 IOMEM(0xe6180244)
53	#define IRQCR4 0xe6180248	53	#define IRQCR4 IOMEM(0xe6180248)
54	#define PDNSEL 0xe6180254	54	#define PDNSEL IOMEM(0xe6180254)
55		55
56	/* INTC */	56	/* INTC */
57	#define ICR1A 0xe6900000	57	#define ICR1A IOMEM(0xe6900000)
58	#define ICR2A 0xe6900004	58	#define ICR2A IOMEM(0xe6900004)
59	#define ICR3A 0xe6900008	59	#define ICR3A IOMEM(0xe6900008)
60	#define ICR4A 0xe690000c	60	#define ICR4A IOMEM(0xe690000c)
61	#define INTMSK00A 0xe6900040	61	#define INTMSK00A IOMEM(0xe6900040)
62	#define INTMSK10A 0xe6900044	62	#define INTMSK10A IOMEM(0xe6900044)
63	#define INTMSK20A 0xe6900048	63	#define INTMSK20A IOMEM(0xe6900048)
64	#define INTMSK30A 0xe690004c	64	#define INTMSK30A IOMEM(0xe690004c)
65		65
66	/* MFIS */	66	/* MFIS */
		67	/* FIXME: pointing where? */
67	#define SMFRAM 0xe6a70000	68	#define SMFRAM 0xe6a70000
68		69
69	/* AP-System Core */	70	/* AP-System Core */
70	#define APARMBAREA 0xe6f10020	71	#define APARMBAREA IOMEM(0xe6f10020)
71		72
72	#ifdef CONFIG_PM	73	#ifdef CONFIG_PM
73		74