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

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

ARM: nomadik: use __iomem pointers for MMIO 



ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.

Acked-by: default avatarAlessandro Rubini <rubini@unipv.it>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent a1b478e8

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
			- NOMADIK_IO_VIRTUAL + NOMADIK_IO_PHYSICAL)



/* used in asm code, so no casts */

#define IO_ADDRESS(x) ((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL)

#define IO_ADDRESS(x) IOMEM((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL)



/*

 *   Base address defination for Nomadik Onchip Logic Block

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

+4 −4
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
struct amba_device;

#include <linux/amba/serial.h>



#define NOMADIK_UART_DR		0x101FB000

#define NOMADIK_UART_LCRH	0x101FB02c

#define NOMADIK_UART_CR		0x101FB030

#define NOMADIK_UART_FR		0x101FB018

#define NOMADIK_UART_DR		(void __iomem *)0x101FB000

#define NOMADIK_UART_LCRH	(void __iomem *)0x101FB02c

#define NOMADIK_UART_CR		(void __iomem *)0x101FB030

#define NOMADIK_UART_FR		(void __iomem *)0x101FB018



static void putc(const char c)

{