diff options
author | Mac Lin <mkl0301@gmail.com> | 2013-03-25 05:24:19 -0400 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-30 15:05:43 -0400 |
commit | fc46d17c4a6b7aa2af11eb9275ed9791f2594ddf (patch) | |
tree | 8e70dc64b73c302b01d713c26ce20f5ae142cd2a | |
parent | a3d9052c6296ad3398d3ad649c3c682c3e7ecfa6 (diff) |
ARM: cns3xxx: remove unused virtual address and iotable defines
Signed-off-by: Mac Lin <mkl0301@gmail.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
-rw-r--r-- | arch/arm/mach-cns3xxx/core.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/cns3xxx.h | 27 |
2 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index 52e4bb5cf12d..126f74f6087c 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c | |||
@@ -32,16 +32,6 @@ static struct map_desc cns3xxx_io_desc[] __initdata = { | |||
32 | .length = SZ_4K, | 32 | .length = SZ_4K, |
33 | .type = MT_DEVICE, | 33 | .type = MT_DEVICE, |
34 | }, { | 34 | }, { |
35 | .virtual = CNS3XXX_GPIOA_BASE_VIRT, | ||
36 | .pfn = __phys_to_pfn(CNS3XXX_GPIOA_BASE), | ||
37 | .length = SZ_4K, | ||
38 | .type = MT_DEVICE, | ||
39 | }, { | ||
40 | .virtual = CNS3XXX_GPIOB_BASE_VIRT, | ||
41 | .pfn = __phys_to_pfn(CNS3XXX_GPIOB_BASE), | ||
42 | .length = SZ_4K, | ||
43 | .type = MT_DEVICE, | ||
44 | }, { | ||
45 | .virtual = CNS3XXX_MISC_BASE_VIRT, | 35 | .virtual = CNS3XXX_MISC_BASE_VIRT, |
46 | .pfn = __phys_to_pfn(CNS3XXX_MISC_BASE), | 36 | .pfn = __phys_to_pfn(CNS3XXX_MISC_BASE), |
47 | .length = SZ_4K, | 37 | .length = SZ_4K, |
diff --git a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h index b1021aafa481..9b145b1e48ea 100644 --- a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h +++ b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h | |||
@@ -20,22 +20,16 @@ | |||
20 | #define CNS3XXX_SPI_FLASH_BASE 0x60000000 /* SPI Serial Flash Memory */ | 20 | #define CNS3XXX_SPI_FLASH_BASE 0x60000000 /* SPI Serial Flash Memory */ |
21 | 21 | ||
22 | #define CNS3XXX_SWITCH_BASE 0x70000000 /* Switch and HNAT Control */ | 22 | #define CNS3XXX_SWITCH_BASE 0x70000000 /* Switch and HNAT Control */ |
23 | #define CNS3XXX_SWITCH_BASE_VIRT 0xFFF00000 | ||
24 | 23 | ||
25 | #define CNS3XXX_PPE_BASE 0x70001000 /* HANT */ | 24 | #define CNS3XXX_PPE_BASE 0x70001000 /* HANT */ |
26 | #define CNS3XXX_PPE_BASE_VIRT 0xFFF50000 | ||
27 | 25 | ||
28 | #define CNS3XXX_EMBEDDED_SRAM_BASE 0x70002000 /* HANT Embedded SRAM */ | 26 | #define CNS3XXX_EMBEDDED_SRAM_BASE 0x70002000 /* HANT Embedded SRAM */ |
29 | #define CNS3XXX_EMBEDDED_SRAM_BASE_VIRT 0xFFF60000 | ||
30 | 27 | ||
31 | #define CNS3XXX_SSP_BASE 0x71000000 /* Synchronous Serial Port - SPI/PCM/I2C */ | 28 | #define CNS3XXX_SSP_BASE 0x71000000 /* Synchronous Serial Port - SPI/PCM/I2C */ |
32 | #define CNS3XXX_SSP_BASE_VIRT 0xFFF01000 | ||
33 | 29 | ||
34 | #define CNS3XXX_DMC_BASE 0x72000000 /* DMC Control (DDR2 SDRAM) */ | 30 | #define CNS3XXX_DMC_BASE 0x72000000 /* DMC Control (DDR2 SDRAM) */ |
35 | #define CNS3XXX_DMC_BASE_VIRT 0xFFF02000 | ||
36 | 31 | ||
37 | #define CNS3XXX_SMC_BASE 0x73000000 /* SMC Control */ | 32 | #define CNS3XXX_SMC_BASE 0x73000000 /* SMC Control */ |
38 | #define CNS3XXX_SMC_BASE_VIRT 0xFFF03000 | ||
39 | 33 | ||
40 | #define SMC_MEMC_STATUS_OFFSET 0x000 | 34 | #define SMC_MEMC_STATUS_OFFSET 0x000 |
41 | #define SMC_MEMIF_CFG_OFFSET 0x004 | 35 | #define SMC_MEMIF_CFG_OFFSET 0x004 |
@@ -74,13 +68,10 @@ | |||
74 | #define SMC_PCELL_ID_3_OFFSET 0xFFC | 68 | #define SMC_PCELL_ID_3_OFFSET 0xFFC |
75 | 69 | ||
76 | #define CNS3XXX_GPIOA_BASE 0x74000000 /* GPIO port A */ | 70 | #define CNS3XXX_GPIOA_BASE 0x74000000 /* GPIO port A */ |
77 | #define CNS3XXX_GPIOA_BASE_VIRT 0xFFF04000 | ||
78 | 71 | ||
79 | #define CNS3XXX_GPIOB_BASE 0x74800000 /* GPIO port B */ | 72 | #define CNS3XXX_GPIOB_BASE 0x74800000 /* GPIO port B */ |
80 | #define CNS3XXX_GPIOB_BASE_VIRT 0xFFF05000 | ||
81 | 73 | ||
82 | #define CNS3XXX_RTC_BASE 0x75000000 /* Real Time Clock */ | 74 | #define CNS3XXX_RTC_BASE 0x75000000 /* Real Time Clock */ |
83 | #define CNS3XXX_RTC_BASE_VIRT 0xFFF06000 | ||
84 | 75 | ||
85 | #define RTC_SEC_OFFSET 0x00 | 76 | #define RTC_SEC_OFFSET 0x00 |
86 | #define RTC_MIN_OFFSET 0x04 | 77 | #define RTC_MIN_OFFSET 0x04 |
@@ -112,22 +103,16 @@ | |||
112 | #define CNS3XXX_UART0_BASE_VIRT 0xFB002000 | 103 | #define CNS3XXX_UART0_BASE_VIRT 0xFB002000 |
113 | 104 | ||
114 | #define CNS3XXX_UART1_BASE 0x78400000 /* UART 1 */ | 105 | #define CNS3XXX_UART1_BASE 0x78400000 /* UART 1 */ |
115 | #define CNS3XXX_UART1_BASE_VIRT 0xFFF0A000 | ||
116 | 106 | ||
117 | #define CNS3XXX_UART2_BASE 0x78800000 /* UART 2 */ | 107 | #define CNS3XXX_UART2_BASE 0x78800000 /* UART 2 */ |
118 | #define CNS3XXX_UART2_BASE_VIRT 0xFFF0B000 | ||
119 | 108 | ||
120 | #define CNS3XXX_DMAC_BASE 0x79000000 /* Generic DMA Control */ | 109 | #define CNS3XXX_DMAC_BASE 0x79000000 /* Generic DMA Control */ |
121 | #define CNS3XXX_DMAC_BASE_VIRT 0xFFF0D000 | ||
122 | 110 | ||
123 | #define CNS3XXX_CORESIGHT_BASE 0x7A000000 /* CoreSight */ | 111 | #define CNS3XXX_CORESIGHT_BASE 0x7A000000 /* CoreSight */ |
124 | #define CNS3XXX_CORESIGHT_BASE_VIRT 0xFFF0E000 | ||
125 | 112 | ||
126 | #define CNS3XXX_CRYPTO_BASE 0x7B000000 /* Crypto */ | 113 | #define CNS3XXX_CRYPTO_BASE 0x7B000000 /* Crypto */ |
127 | #define CNS3XXX_CRYPTO_BASE_VIRT 0xFFF0F000 | ||
128 | 114 | ||
129 | #define CNS3XXX_I2S_BASE 0x7C000000 /* I2S */ | 115 | #define CNS3XXX_I2S_BASE 0x7C000000 /* I2S */ |
130 | #define CNS3XXX_I2S_BASE_VIRT 0xFFF10000 | ||
131 | 116 | ||
132 | #define CNS3XXX_TIMER1_2_3_BASE 0x7C800000 /* Timer */ | 117 | #define CNS3XXX_TIMER1_2_3_BASE 0x7C800000 /* Timer */ |
133 | #define CNS3XXX_TIMER1_2_3_BASE_VIRT 0xFB003000 | 118 | #define CNS3XXX_TIMER1_2_3_BASE_VIRT 0xFB003000 |
@@ -150,42 +135,31 @@ | |||
150 | #define TIMER_FREERUN_CONTROL_OFFSET 0x44 | 135 | #define TIMER_FREERUN_CONTROL_OFFSET 0x44 |
151 | 136 | ||
152 | #define CNS3XXX_HCIE_BASE 0x7D000000 /* HCIE Control */ | 137 | #define CNS3XXX_HCIE_BASE 0x7D000000 /* HCIE Control */ |
153 | #define CNS3XXX_HCIE_BASE_VIRT 0xFFF30000 | ||
154 | 138 | ||
155 | #define CNS3XXX_RAID_BASE 0x7E000000 /* RAID Control */ | 139 | #define CNS3XXX_RAID_BASE 0x7E000000 /* RAID Control */ |
156 | #define CNS3XXX_RAID_BASE_VIRT 0xFFF12000 | ||
157 | 140 | ||
158 | #define CNS3XXX_AXI_IXC_BASE 0x7F000000 /* AXI IXC */ | 141 | #define CNS3XXX_AXI_IXC_BASE 0x7F000000 /* AXI IXC */ |
159 | #define CNS3XXX_AXI_IXC_BASE_VIRT 0xFFF13000 | ||
160 | 142 | ||
161 | #define CNS3XXX_CLCD_BASE 0x80000000 /* LCD Control */ | 143 | #define CNS3XXX_CLCD_BASE 0x80000000 /* LCD Control */ |
162 | #define CNS3XXX_CLCD_BASE_VIRT 0xFFF14000 | ||
163 | 144 | ||
164 | #define CNS3XXX_USBOTG_BASE 0x81000000 /* USB OTG Control */ | 145 | #define CNS3XXX_USBOTG_BASE 0x81000000 /* USB OTG Control */ |
165 | #define CNS3XXX_USBOTG_BASE_VIRT 0xFFF15000 | ||
166 | 146 | ||
167 | #define CNS3XXX_USB_BASE 0x82000000 /* USB Host Control */ | 147 | #define CNS3XXX_USB_BASE 0x82000000 /* USB Host Control */ |
168 | 148 | ||
169 | #define CNS3XXX_SATA2_BASE 0x83000000 /* SATA */ | 149 | #define CNS3XXX_SATA2_BASE 0x83000000 /* SATA */ |
170 | #define CNS3XXX_SATA2_SIZE SZ_16M | 150 | #define CNS3XXX_SATA2_SIZE SZ_16M |
171 | #define CNS3XXX_SATA2_BASE_VIRT 0xFFF17000 | ||
172 | 151 | ||
173 | #define CNS3XXX_CAMERA_BASE 0x84000000 /* Camera Interface */ | 152 | #define CNS3XXX_CAMERA_BASE 0x84000000 /* Camera Interface */ |
174 | #define CNS3XXX_CAMERA_BASE_VIRT 0xFFF18000 | ||
175 | 153 | ||
176 | #define CNS3XXX_SDIO_BASE 0x85000000 /* SDIO */ | 154 | #define CNS3XXX_SDIO_BASE 0x85000000 /* SDIO */ |
177 | #define CNS3XXX_SDIO_BASE_VIRT 0xFFF19000 | ||
178 | 155 | ||
179 | #define CNS3XXX_I2S_TDM_BASE 0x86000000 /* I2S TDM */ | 156 | #define CNS3XXX_I2S_TDM_BASE 0x86000000 /* I2S TDM */ |
180 | #define CNS3XXX_I2S_TDM_BASE_VIRT 0xFFF1A000 | ||
181 | 157 | ||
182 | #define CNS3XXX_2DG_BASE 0x87000000 /* 2D Graphic Control */ | 158 | #define CNS3XXX_2DG_BASE 0x87000000 /* 2D Graphic Control */ |
183 | #define CNS3XXX_2DG_BASE_VIRT 0xFFF1B000 | ||
184 | 159 | ||
185 | #define CNS3XXX_USB_OHCI_BASE 0x88000000 /* USB OHCI */ | 160 | #define CNS3XXX_USB_OHCI_BASE 0x88000000 /* USB OHCI */ |
186 | 161 | ||
187 | #define CNS3XXX_L2C_BASE 0x92000000 /* L2 Cache Control */ | 162 | #define CNS3XXX_L2C_BASE 0x92000000 /* L2 Cache Control */ |
188 | #define CNS3XXX_L2C_BASE_VIRT 0xFFF27000 | ||
189 | 163 | ||
190 | #define CNS3XXX_PCIE0_MEM_BASE 0xA0000000 /* PCIe Port 0 IO/Memory Space */ | 164 | #define CNS3XXX_PCIE0_MEM_BASE 0xA0000000 /* PCIe Port 0 IO/Memory Space */ |
191 | #define CNS3XXX_PCIE0_MEM_BASE_VIRT 0xE0000000 | 165 | #define CNS3XXX_PCIE0_MEM_BASE_VIRT 0xE0000000 |
@@ -239,7 +213,6 @@ | |||
239 | #define CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT (CNS3XXX_TC11MP_SCU_BASE_VIRT + 0x1000) | 213 | #define CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT (CNS3XXX_TC11MP_SCU_BASE_VIRT + 0x1000) |
240 | 214 | ||
241 | #define CNS3XXX_TC11MP_L220_BASE 0x92002000 /* L220 registers */ | 215 | #define CNS3XXX_TC11MP_L220_BASE 0x92002000 /* L220 registers */ |
242 | #define CNS3XXX_TC11MP_L220_BASE_VIRT 0xFF002000 | ||
243 | 216 | ||
244 | /* | 217 | /* |
245 | * Misc block | 218 | * Misc block |