diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 22:20:02 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 15:19:13 +0200 |
commit | c72ecbec1999204be15e40ade63585b16a6f713a (patch) | |
tree | 6aab28ea0eaa15d7b8a9ee372d99aa1b029001dc /arch/arm/mach-ks8695/include | |
parent | ARM: ixp4xx: use __iomem pointers for MMIO (diff) | |
download | linux-c72ecbec1999204be15e40ade63585b16a6f713a.tar.xz linux-c72ecbec1999204be15e40ade63585b16a6f713a.zip |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ks8695/include')
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/hardware.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/uncompress.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h index 5e0c388143da..5090338c0db2 100644 --- a/arch/arm/mach-ks8695/include/mach/hardware.h +++ b/arch/arm/mach-ks8695/include/mach/hardware.h @@ -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 diff --git a/arch/arm/mach-ks8695/include/mach/uncompress.h b/arch/arm/mach-ks8695/include/mach/uncompress.h index 9495cb4d701a..8879d610308a 100644 --- a/arch/arm/mach-ks8695/include/mach/uncompress.h +++ b/arch/arm/mach-ks8695/include/mach/uncompress.h @@ -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(); } |