Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 29fe651f8fb74d9bd8dd850488f7d773e8b37534

Authored by Arnd Bergmann
Committed by Ryan Mallon
1 parent c081705623

ARM: ep93xx: 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: Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ryan Mallon <rmallon@gmail.com>

Showing 2 changed files with 10 additions and 10 deletions Side-by-side Diff

arch/arm/mach-ep93xx/include/mach/ts72xx.h
Diff comments   View file @ 29fe651
... ... @@ -14,7 +14,7 @@
14 14 */
15 15  
16 16 #define TS72XX_MODEL_PHYS_BASE 0x22000000
17   -#define TS72XX_MODEL_VIRT_BASE 0xfebff000
  17 +#define TS72XX_MODEL_VIRT_BASE IOMEM(0xfebff000)
18 18 #define TS72XX_MODEL_SIZE 0x00001000
19 19  
20 20 #define TS72XX_MODEL_TS7200 0x00
... ... @@ -26,7 +26,7 @@
26 26  
27 27  
28 28 #define TS72XX_OPTIONS_PHYS_BASE 0x22400000
29   -#define TS72XX_OPTIONS_VIRT_BASE 0xfebfe000
  29 +#define TS72XX_OPTIONS_VIRT_BASE IOMEM(0xfebfe000)
30 30 #define TS72XX_OPTIONS_SIZE 0x00001000
31 31  
32 32 #define TS72XX_OPTIONS_COM2_RS485 0x02
33 33  
34 34  
... ... @@ -34,18 +34,18 @@
34 34  
35 35  
36 36 #define TS72XX_OPTIONS2_PHYS_BASE 0x22800000
37   -#define TS72XX_OPTIONS2_VIRT_BASE 0xfebfd000
  37 +#define TS72XX_OPTIONS2_VIRT_BASE IOMEM(0xfebfd000)
38 38 #define TS72XX_OPTIONS2_SIZE 0x00001000
39 39  
40 40 #define TS72XX_OPTIONS2_TS9420 0x04
41 41 #define TS72XX_OPTIONS2_TS9420_BOOT 0x02
42 42  
43 43  
44   -#define TS72XX_RTC_INDEX_VIRT_BASE 0xfebf9000
  44 +#define TS72XX_RTC_INDEX_VIRT_BASE IOMEM(0xfebf9000)
45 45 #define TS72XX_RTC_INDEX_PHYS_BASE 0x10800000
46 46 #define TS72XX_RTC_INDEX_SIZE 0x00001000
47 47  
48   -#define TS72XX_RTC_DATA_VIRT_BASE 0xfebf8000
  48 +#define TS72XX_RTC_DATA_VIRT_BASE IOMEM(0xfebf8000)
49 49 #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000
50 50 #define TS72XX_RTC_DATA_SIZE 0x00001000
51 51  
arch/arm/mach-ep93xx/ts72xx.c
Diff comments   View file @ 29fe651
... ... @@ -32,27 +32,27 @@
32 32  
33 33 static struct map_desc ts72xx_io_desc[] __initdata = {
34 34 {
35   - .virtual = TS72XX_MODEL_VIRT_BASE,
  35 + .virtual = (unsigned long)TS72XX_MODEL_VIRT_BASE,
36 36 .pfn = __phys_to_pfn(TS72XX_MODEL_PHYS_BASE),
37 37 .length = TS72XX_MODEL_SIZE,
38 38 .type = MT_DEVICE,
39 39 }, {
40   - .virtual = TS72XX_OPTIONS_VIRT_BASE,
  40 + .virtual = (unsigned long)TS72XX_OPTIONS_VIRT_BASE,
41 41 .pfn = __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE),
42 42 .length = TS72XX_OPTIONS_SIZE,
43 43 .type = MT_DEVICE,
44 44 }, {
45   - .virtual = TS72XX_OPTIONS2_VIRT_BASE,
  45 + .virtual = (unsigned long)TS72XX_OPTIONS2_VIRT_BASE,
46 46 .pfn = __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),
47 47 .length = TS72XX_OPTIONS2_SIZE,
48 48 .type = MT_DEVICE,
49 49 }, {
50   - .virtual = TS72XX_RTC_INDEX_VIRT_BASE,
  50 + .virtual = (unsigned long)TS72XX_RTC_INDEX_VIRT_BASE,
51 51 .pfn = __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE),
52 52 .length = TS72XX_RTC_INDEX_SIZE,
53 53 .type = MT_DEVICE,
54 54 }, {
55   - .virtual = TS72XX_RTC_DATA_VIRT_BASE,
  55 + .virtual = (unsigned long)TS72XX_RTC_DATA_VIRT_BASE,
56 56 .pfn = __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE),
57 57 .length = TS72XX_RTC_DATA_SIZE,
58 58 .type = MT_DEVICE,