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

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

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

arch/arm/mach-ebsa110/core.c

+4 −4
Original line number Diff line number Diff line
@@ -74,22 +74,22 @@ static struct map_desc ebsa110_io_desc[] __initdata = { 
	 * sparse external-decode ISAIO space

	 */

	{	/* IRQ_STAT/IRQ_MCLR */

		.virtual	= IRQ_STAT,

		.virtual	= (unsigned long)IRQ_STAT,

		.pfn		= __phys_to_pfn(TRICK4_PHYS),

		.length		= TRICK4_SIZE,

		.type		= MT_DEVICE

	}, {	/* IRQ_MASK/IRQ_MSET */

		.virtual	= IRQ_MASK,

		.virtual	= (unsigned long)IRQ_MASK,

		.pfn		= __phys_to_pfn(TRICK3_PHYS),

		.length		= TRICK3_SIZE,

		.type		= MT_DEVICE

	}, {	/* SOFT_BASE */

		.virtual	= SOFT_BASE,

		.virtual	= (unsigned long)SOFT_BASE,

		.pfn		= __phys_to_pfn(TRICK1_PHYS),

		.length		= TRICK1_SIZE,

		.type		= MT_DEVICE

	}, {	/* PIT_BASE */

		.virtual	= PIT_BASE,

		.virtual	= (unsigned long)PIT_BASE,

		.pfn		= __phys_to_pfn(TRICK0_PHYS),

		.length		= TRICK0_SIZE,

		.type		= MT_DEVICE

arch/arm/mach-ebsa110/core.h

+6 −6
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ 
#define TRICK7_PHYS		0xf3c00000



/* Virtual addresses */

#define PIT_BASE		0xfc000000	/* trick 0 */

#define SOFT_BASE		0xfd000000	/* trick 1 */

#define IRQ_MASK		0xfe000000	/* trick 3 - read */

#define IRQ_MSET		0xfe000000	/* trick 3 - write */

#define IRQ_STAT		0xff000000	/* trick 4 - read */

#define IRQ_MCLR		0xff000000	/* trick 4 - write */

#define PIT_BASE		IOMEM(0xfc000000)	/* trick 0 */

#define SOFT_BASE		IOMEM(0xfd000000)	/* trick 1 */

#define IRQ_MASK		IOMEM(0xfe000000)	/* trick 3 - read */

#define IRQ_MSET		IOMEM(0xfe000000)	/* trick 3 - write */

#define IRQ_STAT		IOMEM(0xff000000)	/* trick 4 - read */

#define IRQ_MCLR		IOMEM(0xff000000)	/* trick 4 - write */



#endif