diff options
-rw-r--r-- | arch/arm/mach-lpc32xx/common.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-lpc32xx/include/mach/hardware.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c index a48dc2dec48..0d4db8c544b 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c | |||
@@ -177,25 +177,25 @@ u32 clk_get_pclk_div(void) | |||
177 | 177 | ||
178 | static struct map_desc lpc32xx_io_desc[] __initdata = { | 178 | static struct map_desc lpc32xx_io_desc[] __initdata = { |
179 | { | 179 | { |
180 | .virtual = IO_ADDRESS(LPC32XX_AHB0_START), | 180 | .virtual = (unsigned long)IO_ADDRESS(LPC32XX_AHB0_START), |
181 | .pfn = __phys_to_pfn(LPC32XX_AHB0_START), | 181 | .pfn = __phys_to_pfn(LPC32XX_AHB0_START), |
182 | .length = LPC32XX_AHB0_SIZE, | 182 | .length = LPC32XX_AHB0_SIZE, |
183 | .type = MT_DEVICE | 183 | .type = MT_DEVICE |
184 | }, | 184 | }, |
185 | { | 185 | { |
186 | .virtual = IO_ADDRESS(LPC32XX_AHB1_START), | 186 | .virtual = (unsigned long)IO_ADDRESS(LPC32XX_AHB1_START), |
187 | .pfn = __phys_to_pfn(LPC32XX_AHB1_START), | 187 | .pfn = __phys_to_pfn(LPC32XX_AHB1_START), |
188 | .length = LPC32XX_AHB1_SIZE, | 188 | .length = LPC32XX_AHB1_SIZE, |
189 | .type = MT_DEVICE | 189 | .type = MT_DEVICE |
190 | }, | 190 | }, |
191 | { | 191 | { |
192 | .virtual = IO_ADDRESS(LPC32XX_FABAPB_START), | 192 | .virtual = (unsigned long)IO_ADDRESS(LPC32XX_FABAPB_START), |
193 | .pfn = __phys_to_pfn(LPC32XX_FABAPB_START), | 193 | .pfn = __phys_to_pfn(LPC32XX_FABAPB_START), |
194 | .length = LPC32XX_FABAPB_SIZE, | 194 | .length = LPC32XX_FABAPB_SIZE, |
195 | .type = MT_DEVICE | 195 | .type = MT_DEVICE |
196 | }, | 196 | }, |
197 | { | 197 | { |
198 | .virtual = IO_ADDRESS(LPC32XX_IRAM_BASE), | 198 | .virtual = (unsigned long)IO_ADDRESS(LPC32XX_IRAM_BASE), |
199 | .pfn = __phys_to_pfn(LPC32XX_IRAM_BASE), | 199 | .pfn = __phys_to_pfn(LPC32XX_IRAM_BASE), |
200 | .length = (LPC32XX_IRAM_BANK_SIZE * 2), | 200 | .length = (LPC32XX_IRAM_BANK_SIZE * 2), |
201 | .type = MT_DEVICE | 201 | .type = MT_DEVICE |
diff --git a/arch/arm/mach-lpc32xx/include/mach/hardware.h b/arch/arm/mach-lpc32xx/include/mach/hardware.h index 33e1dde37bd..69065de97a3 100644 --- a/arch/arm/mach-lpc32xx/include/mach/hardware.h +++ b/arch/arm/mach-lpc32xx/include/mach/hardware.h | |||
@@ -25,7 +25,7 @@ | |||
25 | /* | 25 | /* |
26 | * This macro relies on fact that for all HW i/o addresses bits 20-23 are 0 | 26 | * This macro relies on fact that for all HW i/o addresses bits 20-23 are 0 |
27 | */ | 27 | */ |
28 | #define IO_ADDRESS(x) (((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\ | 28 | #define IO_ADDRESS(x) IOMEM(((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\ |
29 | IO_BASE) | 29 | IO_BASE) |
30 | 30 | ||
31 | #define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x)) | 31 | #define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x)) |