diff options
Diffstat (limited to 'arch/arm/mach-ks8695')
-rw-r--r-- | arch/arm/mach-ks8695/cpu.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/hardware.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/uncompress.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ks8695/cpu.c b/arch/arm/mach-ks8695/cpu.c index 7f3f24053a00..ddb24222918e 100644 --- a/arch/arm/mach-ks8695/cpu.c +++ b/arch/arm/mach-ks8695/cpu.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | static struct __initdata map_desc ks8695_io_desc[] = { | 37 | static struct __initdata map_desc ks8695_io_desc[] = { |
38 | { | 38 | { |
39 | .virtual = KS8695_IO_VA, | 39 | .virtual = (unsigned long)KS8695_IO_VA, |
40 | .pfn = __phys_to_pfn(KS8695_IO_PA), | 40 | .pfn = __phys_to_pfn(KS8695_IO_PA), |
41 | .length = KS8695_IO_SIZE, | 41 | .length = KS8695_IO_SIZE, |
42 | .type = MT_DEVICE, | 42 | .type = MT_DEVICE, |
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 @@ | |||
33 | * head debug code as the initial MMU setup only deals in L1 sections. | 33 | * head debug code as the initial MMU setup only deals in L1 sections. |
34 | */ | 34 | */ |
35 | #define KS8695_IO_PA 0x03F00000 | 35 | #define KS8695_IO_PA 0x03F00000 |
36 | #define KS8695_IO_VA 0xF0000000 | 36 | #define KS8695_IO_VA IOMEM(0xF0000000) |
37 | #define KS8695_IO_SIZE SZ_1M | 37 | #define KS8695_IO_SIZE SZ_1M |
38 | 38 | ||
39 | #define KS8695_PCIMEM_PA 0x60000000 | 39 | #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 @@ | |||
19 | 19 | ||
20 | static void putc(char c) | 20 | static void putc(char c) |
21 | { | 21 | { |
22 | while (!(__raw_readl(KS8695_UART_PA + KS8695_URLS) & URLS_URTHRE)) | 22 | while (!(__raw_readl((void __iomem*)KS8695_UART_PA + KS8695_URLS) & URLS_URTHRE)) |
23 | barrier(); | 23 | barrier(); |
24 | 24 | ||
25 | __raw_writel(c, KS8695_UART_PA + KS8695_URTH); | 25 | __raw_writel(c, (void __iomem*)KS8695_UART_PA + KS8695_URTH); |
26 | } | 26 | } |
27 | 27 | ||
28 | static inline void flush(void) | 28 | static inline void flush(void) |
29 | { | 29 | { |
30 | while (!(__raw_readl(KS8695_UART_PA + KS8695_URLS) & URLS_URTE)) | 30 | while (!(__raw_readl((void __iomem*)KS8695_UART_PA + KS8695_URLS) & URLS_URTE)) |
31 | barrier(); | 31 | barrier(); |
32 | } | 32 | } |
33 | 33 | ||