hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: lpc32xx: use __iomem pointers for MMIO 

ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.

Cc: Roland Stigge <stigge@antcom.de>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-09-14 20:20:24 +00:00
parent c72ecbec19
commit df38b24fa8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-lpc32xx/common.c
View File

@ -177,25 +177,25 @@ u32 clk_get_pclk_div(void)
static struct map_desc lpc32xx_io_desc[] __initdata = { static struct map_desc lpc32xx_io_desc[] __initdata = {
{ {
.virtual = IO_ADDRESS(LPC32XX_AHB0_START), .virtual = (unsigned long)IO_ADDRESS(LPC32XX_AHB0_START),
.pfn = __phys_to_pfn(LPC32XX_AHB0_START), .pfn = __phys_to_pfn(LPC32XX_AHB0_START),
.length = LPC32XX_AHB0_SIZE, .length = LPC32XX_AHB0_SIZE,
.type = MT_DEVICE .type = MT_DEVICE
}, },
{ {
.virtual = IO_ADDRESS(LPC32XX_AHB1_START), .virtual = (unsigned long)IO_ADDRESS(LPC32XX_AHB1_START),
.pfn = __phys_to_pfn(LPC32XX_AHB1_START), .pfn = __phys_to_pfn(LPC32XX_AHB1_START),
.length = LPC32XX_AHB1_SIZE, .length = LPC32XX_AHB1_SIZE,
.type = MT_DEVICE .type = MT_DEVICE
}, },
{ {
.virtual = IO_ADDRESS(LPC32XX_FABAPB_START), .virtual = (unsigned long)IO_ADDRESS(LPC32XX_FABAPB_START),
.pfn = __phys_to_pfn(LPC32XX_FABAPB_START), .pfn = __phys_to_pfn(LPC32XX_FABAPB_START),
.length = LPC32XX_FABAPB_SIZE, .length = LPC32XX_FABAPB_SIZE,
.type = MT_DEVICE .type = MT_DEVICE
}, },
{ {
.virtual = IO_ADDRESS(LPC32XX_IRAM_BASE), .virtual = (unsigned long)IO_ADDRESS(LPC32XX_IRAM_BASE),
.pfn = __phys_to_pfn(LPC32XX_IRAM_BASE), .pfn = __phys_to_pfn(LPC32XX_IRAM_BASE),
.length = (LPC32XX_IRAM_BANK_SIZE * 2), .length = (LPC32XX_IRAM_BANK_SIZE * 2),
.type = MT_DEVICE .type = MT_DEVICE

2
arch/arm/mach-lpc32xx/include/mach/hardware.h
View File

@ -25,7 +25,7 @@
/* /*
* This macro relies on fact that for all HW i/o addresses bits 20-23 are 0 * This macro relies on fact that for all HW i/o addresses bits 20-23 are 0
*/ */
#define IO_ADDRESS(x) (((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\ #define IO_ADDRESS(x) IOMEM(((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\
IO_BASE) IO_BASE)
#define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x)) #define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x))