evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: ks8695: use __iomem pointers for MMIO

Browse source 
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>
This commit is contained in:
Arnd Bergmann 2012-09-14 20:20:02 +00:00
parent 13ec32f47c
commit c72ecbec19
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-ks8695/cpu.c
View file

@ -36,7 +36,7 @@
static struct __initdata map_desc ks8695_io_desc[] = { 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), .pfn = __phys_to_pfn(KS8695_IO_PA),
.length = KS8695_IO_SIZE, .length = KS8695_IO_SIZE,
.type = MT_DEVICE, .type = MT_DEVICE,

2
arch/arm/mach-ks8695/include/mach/hardware.h
View file

@ -33,7 +33,7 @@
* head debug code as the initial MMU setup only deals in L1 sections. * head debug code as the initial MMU setup only deals in L1 sections.
*/ */
#define KS8695_IO_PA 0x03F00000 #define KS8695_IO_PA 0x03F00000
#define KS8695_IO_VA 0xF0000000 #define KS8695_IO_VA IOMEM(0xF0000000)
#define KS8695_IO_SIZE SZ_1M #define KS8695_IO_SIZE SZ_1M
#define KS8695_PCIMEM_PA 0x60000000 #define KS8695_PCIMEM_PA 0x60000000

6
arch/arm/mach-ks8695/include/mach/uncompress.h
View file

@ -19,15 +19,15 @@
static void putc(char c) 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(); barrier();
__raw_writel(c, KS8695_UART_PA + KS8695_URTH); __raw_writel(c, (void __iomem*)KS8695_UART_PA + KS8695_URTH);
} }
static inline void flush(void) 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(); barrier();
} }