diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 16:11:12 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-18 04:15:12 -0400 |
commit | a21e5e282b7293ce1a192757ffe1baa71618961c (patch) | |
tree | 8ae917b10b3b15651eeb752c70a4f5c334326449 /arch/arm/mach-ebsa110 | |
parent | dca4ba4121a66bdd0d85d02df21aee2738edcf5a (diff) |
ARM: ebsa110: use __iomem pointers for MMIO
ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ebsa110')
-rw-r--r-- | arch/arm/mach-ebsa110/core.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/core.h | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index 6f8068692edf..f0fe6b5350e2 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c | |||
@@ -74,22 +74,22 @@ static struct map_desc ebsa110_io_desc[] __initdata = { | |||
74 | * sparse external-decode ISAIO space | 74 | * sparse external-decode ISAIO space |
75 | */ | 75 | */ |
76 | { /* IRQ_STAT/IRQ_MCLR */ | 76 | { /* IRQ_STAT/IRQ_MCLR */ |
77 | .virtual = IRQ_STAT, | 77 | .virtual = (unsigned long)IRQ_STAT, |
78 | .pfn = __phys_to_pfn(TRICK4_PHYS), | 78 | .pfn = __phys_to_pfn(TRICK4_PHYS), |
79 | .length = TRICK4_SIZE, | 79 | .length = TRICK4_SIZE, |
80 | .type = MT_DEVICE | 80 | .type = MT_DEVICE |
81 | }, { /* IRQ_MASK/IRQ_MSET */ | 81 | }, { /* IRQ_MASK/IRQ_MSET */ |
82 | .virtual = IRQ_MASK, | 82 | .virtual = (unsigned long)IRQ_MASK, |
83 | .pfn = __phys_to_pfn(TRICK3_PHYS), | 83 | .pfn = __phys_to_pfn(TRICK3_PHYS), |
84 | .length = TRICK3_SIZE, | 84 | .length = TRICK3_SIZE, |
85 | .type = MT_DEVICE | 85 | .type = MT_DEVICE |
86 | }, { /* SOFT_BASE */ | 86 | }, { /* SOFT_BASE */ |
87 | .virtual = SOFT_BASE, | 87 | .virtual = (unsigned long)SOFT_BASE, |
88 | .pfn = __phys_to_pfn(TRICK1_PHYS), | 88 | .pfn = __phys_to_pfn(TRICK1_PHYS), |
89 | .length = TRICK1_SIZE, | 89 | .length = TRICK1_SIZE, |
90 | .type = MT_DEVICE | 90 | .type = MT_DEVICE |
91 | }, { /* PIT_BASE */ | 91 | }, { /* PIT_BASE */ |
92 | .virtual = PIT_BASE, | 92 | .virtual = (unsigned long)PIT_BASE, |
93 | .pfn = __phys_to_pfn(TRICK0_PHYS), | 93 | .pfn = __phys_to_pfn(TRICK0_PHYS), |
94 | .length = TRICK0_SIZE, | 94 | .length = TRICK0_SIZE, |
95 | .type = MT_DEVICE | 95 | .type = MT_DEVICE |
diff --git a/arch/arm/mach-ebsa110/core.h b/arch/arm/mach-ebsa110/core.h index c93c9e43012d..afe137ee172e 100644 --- a/arch/arm/mach-ebsa110/core.h +++ b/arch/arm/mach-ebsa110/core.h | |||
@@ -31,11 +31,11 @@ | |||
31 | #define TRICK7_PHYS 0xf3c00000 | 31 | #define TRICK7_PHYS 0xf3c00000 |
32 | 32 | ||
33 | /* Virtual addresses */ | 33 | /* Virtual addresses */ |
34 | #define PIT_BASE 0xfc000000 /* trick 0 */ | 34 | #define PIT_BASE IOMEM(0xfc000000) /* trick 0 */ |
35 | #define SOFT_BASE 0xfd000000 /* trick 1 */ | 35 | #define SOFT_BASE IOMEM(0xfd000000) /* trick 1 */ |
36 | #define IRQ_MASK 0xfe000000 /* trick 3 - read */ | 36 | #define IRQ_MASK IOMEM(0xfe000000) /* trick 3 - read */ |
37 | #define IRQ_MSET 0xfe000000 /* trick 3 - write */ | 37 | #define IRQ_MSET IOMEM(0xfe000000) /* trick 3 - write */ |
38 | #define IRQ_STAT 0xff000000 /* trick 4 - read */ | 38 | #define IRQ_STAT IOMEM(0xff000000) /* trick 4 - read */ |
39 | #define IRQ_MCLR 0xff000000 /* trick 4 - write */ | 39 | #define IRQ_MCLR IOMEM(0xff000000) /* trick 4 - write */ |
40 | 40 | ||
41 | #endif | 41 | #endif |