diff options
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/ts72xx.h | 10 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h index f1397a13e76b..071feaa30adc 100644 --- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h +++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #define TS72XX_MODEL_PHYS_BASE 0x22000000 | 16 | #define TS72XX_MODEL_PHYS_BASE 0x22000000 |
17 | #define TS72XX_MODEL_VIRT_BASE 0xfebff000 | 17 | #define TS72XX_MODEL_VIRT_BASE IOMEM(0xfebff000) |
18 | #define TS72XX_MODEL_SIZE 0x00001000 | 18 | #define TS72XX_MODEL_SIZE 0x00001000 |
19 | 19 | ||
20 | #define TS72XX_MODEL_TS7200 0x00 | 20 | #define TS72XX_MODEL_TS7200 0x00 |
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | 27 | ||
28 | #define TS72XX_OPTIONS_PHYS_BASE 0x22400000 | 28 | #define TS72XX_OPTIONS_PHYS_BASE 0x22400000 |
29 | #define TS72XX_OPTIONS_VIRT_BASE 0xfebfe000 | 29 | #define TS72XX_OPTIONS_VIRT_BASE IOMEM(0xfebfe000) |
30 | #define TS72XX_OPTIONS_SIZE 0x00001000 | 30 | #define TS72XX_OPTIONS_SIZE 0x00001000 |
31 | 31 | ||
32 | #define TS72XX_OPTIONS_COM2_RS485 0x02 | 32 | #define TS72XX_OPTIONS_COM2_RS485 0x02 |
@@ -34,18 +34,18 @@ | |||
34 | 34 | ||
35 | 35 | ||
36 | #define TS72XX_OPTIONS2_PHYS_BASE 0x22800000 | 36 | #define TS72XX_OPTIONS2_PHYS_BASE 0x22800000 |
37 | #define TS72XX_OPTIONS2_VIRT_BASE 0xfebfd000 | 37 | #define TS72XX_OPTIONS2_VIRT_BASE IOMEM(0xfebfd000) |
38 | #define TS72XX_OPTIONS2_SIZE 0x00001000 | 38 | #define TS72XX_OPTIONS2_SIZE 0x00001000 |
39 | 39 | ||
40 | #define TS72XX_OPTIONS2_TS9420 0x04 | 40 | #define TS72XX_OPTIONS2_TS9420 0x04 |
41 | #define TS72XX_OPTIONS2_TS9420_BOOT 0x02 | 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 | #define TS72XX_RTC_INDEX_PHYS_BASE 0x10800000 | 45 | #define TS72XX_RTC_INDEX_PHYS_BASE 0x10800000 |
46 | #define TS72XX_RTC_INDEX_SIZE 0x00001000 | 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 | #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 | 49 | #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 |
50 | #define TS72XX_RTC_DATA_SIZE 0x00001000 | 50 | #define TS72XX_RTC_DATA_SIZE 0x00001000 |
51 | 51 | ||
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 75cab2d7ec73..faa5bddd283f 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
@@ -32,27 +32,27 @@ | |||
32 | 32 | ||
33 | static struct map_desc ts72xx_io_desc[] __initdata = { | 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 | .pfn = __phys_to_pfn(TS72XX_MODEL_PHYS_BASE), | 36 | .pfn = __phys_to_pfn(TS72XX_MODEL_PHYS_BASE), |
37 | .length = TS72XX_MODEL_SIZE, | 37 | .length = TS72XX_MODEL_SIZE, |
38 | .type = MT_DEVICE, | 38 | .type = MT_DEVICE, |
39 | }, { | 39 | }, { |
40 | .virtual = TS72XX_OPTIONS_VIRT_BASE, | 40 | .virtual = (unsigned long)TS72XX_OPTIONS_VIRT_BASE, |
41 | .pfn = __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE), | 41 | .pfn = __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE), |
42 | .length = TS72XX_OPTIONS_SIZE, | 42 | .length = TS72XX_OPTIONS_SIZE, |
43 | .type = MT_DEVICE, | 43 | .type = MT_DEVICE, |
44 | }, { | 44 | }, { |
45 | .virtual = TS72XX_OPTIONS2_VIRT_BASE, | 45 | .virtual = (unsigned long)TS72XX_OPTIONS2_VIRT_BASE, |
46 | .pfn = __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE), | 46 | .pfn = __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE), |
47 | .length = TS72XX_OPTIONS2_SIZE, | 47 | .length = TS72XX_OPTIONS2_SIZE, |
48 | .type = MT_DEVICE, | 48 | .type = MT_DEVICE, |
49 | }, { | 49 | }, { |
50 | .virtual = TS72XX_RTC_INDEX_VIRT_BASE, | 50 | .virtual = (unsigned long)TS72XX_RTC_INDEX_VIRT_BASE, |
51 | .pfn = __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE), | 51 | .pfn = __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE), |
52 | .length = TS72XX_RTC_INDEX_SIZE, | 52 | .length = TS72XX_RTC_INDEX_SIZE, |
53 | .type = MT_DEVICE, | 53 | .type = MT_DEVICE, |
54 | }, { | 54 | }, { |
55 | .virtual = TS72XX_RTC_DATA_VIRT_BASE, | 55 | .virtual = (unsigned long)TS72XX_RTC_DATA_VIRT_BASE, |
56 | .pfn = __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE), | 56 | .pfn = __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE), |
57 | .length = TS72XX_RTC_DATA_SIZE, | 57 | .length = TS72XX_RTC_DATA_SIZE, |
58 | .type = MT_DEVICE, | 58 | .type = MT_DEVICE, |