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

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

ARM: ks8695: 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: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 13ec32f4

arch/arm/mach-ks8695/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


static struct __initdata map_desc ks8695_io_desc[] = {

	{

		.virtual	= KS8695_IO_VA,

		.virtual	= (unsigned long)KS8695_IO_VA,

		.pfn		= __phys_to_pfn(KS8695_IO_PA),

		.length		= KS8695_IO_SIZE,

		.type		= MT_DEVICE,

arch/arm/mach-ks8695/include/mach/hardware.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
 * head debug code as the initial MMU setup only deals in L1 sections.

 */

#define KS8695_IO_PA		0x03F00000

#define KS8695_IO_VA		0xF0000000

#define KS8695_IO_VA		IOMEM(0xF0000000)

#define KS8695_IO_SIZE		SZ_1M



#define KS8695_PCIMEM_PA	0x60000000

arch/arm/mach-ks8695/include/mach/uncompress.h

+3 −3
Original line number Diff line number Diff line
@@ -19,15 +19,15 @@ 


static void putc(char c)

{

	while (!(__raw_readl(KS8695_UART_PA + KS8695_URLS) & URLS_URTHRE))

	while (!(__raw_readl((void __iomem*)KS8695_UART_PA + KS8695_URLS) & URLS_URTHRE))

		barrier();



	__raw_writel(c, KS8695_UART_PA + KS8695_URTH);

	__raw_writel(c, (void __iomem*)KS8695_UART_PA + KS8695_URTH);

}



static inline void flush(void)

{

	while (!(__raw_readl(KS8695_UART_PA + KS8695_URLS) & URLS_URTE))

	while (!(__raw_readl((void __iomem*)KS8695_UART_PA + KS8695_URLS) & URLS_URTE))

		barrier();

}