Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: sa1100: 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: Jochen Friedrich <jochen@scram.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+2 -2
+1 -1
arch/arm/mach-sa1100/include/mach/simpad.h
··· 87 87 #define SIMPAD_CS3_PCMCIA_SHORT (SIMPAD_CS3_GPIO_BASE + 22) 88 88 #define SIMPAD_CS3_GPIO_23 (SIMPAD_CS3_GPIO_BASE + 23) 89 89 90 - #define CS3_BASE 0xf1000000 90 + #define CS3_BASE IOMEM(0xf1000000) 91 91 92 92 long simpad_get_cs3_ro(void); 93 93 long simpad_get_cs3_shadow(void);
+1 -1
arch/arm/mach-sa1100/simpad.c
··· 124 124 .length = 0x00800000, 125 125 .type = MT_DEVICE 126 126 }, { /* Simpad CS3 */ 127 - .virtual = CS3_BASE, 127 + .virtual = (unsigned long)CS3_BASE, 128 128 .pfn = __phys_to_pfn(SA1100_CS3_PHYS), 129 129 .length = 0x00100000, 130 130 .type = MT_DEVICE