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

Commit 29fe651f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ryan Mallon
Browse files

ARM: ep93xx: 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: Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRyan Mallon <rmallon@gmail.com>
parent c0817056

arch/arm/mach-ep93xx/include/mach/ts72xx.h

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 */



#define TS72XX_MODEL_PHYS_BASE		0x22000000

#define TS72XX_MODEL_VIRT_BASE		0xfebff000

#define TS72XX_MODEL_VIRT_BASE		IOMEM(0xfebff000)

#define TS72XX_MODEL_SIZE		0x00001000



#define TS72XX_MODEL_TS7200		0x00
@@ -26,7 +26,7 @@ 




#define TS72XX_OPTIONS_PHYS_BASE	0x22400000

#define TS72XX_OPTIONS_VIRT_BASE	0xfebfe000

#define TS72XX_OPTIONS_VIRT_BASE	IOMEM(0xfebfe000)

#define TS72XX_OPTIONS_SIZE		0x00001000



#define TS72XX_OPTIONS_COM2_RS485	0x02
@@ -34,18 +34,18 @@ 




#define TS72XX_OPTIONS2_PHYS_BASE	0x22800000

#define TS72XX_OPTIONS2_VIRT_BASE	0xfebfd000

#define TS72XX_OPTIONS2_VIRT_BASE	IOMEM(0xfebfd000)

#define TS72XX_OPTIONS2_SIZE		0x00001000



#define TS72XX_OPTIONS2_TS9420		0x04

#define TS72XX_OPTIONS2_TS9420_BOOT	0x02





#define TS72XX_RTC_INDEX_VIRT_BASE	0xfebf9000

#define TS72XX_RTC_INDEX_VIRT_BASE	IOMEM(0xfebf9000)

#define TS72XX_RTC_INDEX_PHYS_BASE	0x10800000

#define TS72XX_RTC_INDEX_SIZE		0x00001000



#define TS72XX_RTC_DATA_VIRT_BASE	0xfebf8000

#define TS72XX_RTC_DATA_VIRT_BASE	IOMEM(0xfebf8000)

#define TS72XX_RTC_DATA_PHYS_BASE	0x11700000

#define TS72XX_RTC_DATA_SIZE		0x00001000

arch/arm/mach-ep93xx/ts72xx.c

+5 −5
Original line number Diff line number Diff line
@@ -32,27 +32,27 @@ 


static struct map_desc ts72xx_io_desc[] __initdata = {

	{

		.virtual	= TS72XX_MODEL_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_MODEL_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_MODEL_PHYS_BASE),

		.length		= TS72XX_MODEL_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_OPTIONS_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_OPTIONS_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE),

		.length		= TS72XX_OPTIONS_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_OPTIONS2_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_OPTIONS2_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),

		.length		= TS72XX_OPTIONS2_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_RTC_INDEX_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_RTC_INDEX_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE),

		.length		= TS72XX_RTC_INDEX_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_RTC_DATA_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_RTC_DATA_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE),

		.length		= TS72XX_RTC_DATA_SIZE,

		.type		= MT_DEVICE,