Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b55056ea authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parent 49d394be

arch/arm/mach-sa1100/include/mach/simpad.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
#define SIMPAD_CS3_PCMCIA_SHORT		(SIMPAD_CS3_GPIO_BASE + 22)

#define SIMPAD_CS3_GPIO_23		(SIMPAD_CS3_GPIO_BASE + 23)



#define CS3_BASE        0xf1000000

#define CS3_BASE        IOMEM(0xf1000000)



long simpad_get_cs3_ro(void);

long simpad_get_cs3_shadow(void);

arch/arm/mach-sa1100/simpad.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static struct map_desc simpad_io_desc[] __initdata = { 
		.length		= 0x00800000,

		.type		= MT_DEVICE

	}, {	/* Simpad CS3 */

		.virtual	= CS3_BASE,

		.virtual	= (unsigned long)CS3_BASE,

		.pfn		= __phys_to_pfn(SA1100_CS3_PHYS),

		.length		= 0x00100000,

		.type		= MT_DEVICE