[ARM] 4519/1: S3C: split S3C2400 values out of S3C24XX map.h

Move the S3C2400 values to their own include directory
series in include/asm-arm/arch-s3c2400 as the support
for the S3C2400 is best placed in its own arch directory.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Ben Dooks and committed by Russell King ae39ae0b a45f8261

+66 -51
+66
include/asm-arm/arch-s3c2400/map.h
···
··· 1 + /* linux/include/asm-arm/arch-s3c2400/map.h 2 + * 3 + * Copyright 2003,2007 Simtec Electronics 4 + * http://armlinux.simtec.co.uk/ 5 + * Ben Dooks <ben@simtec.co.uk> 6 + * 7 + * Copyright 2003, Lucas Correia Villa Real 8 + * 9 + * S3C2400 - Memory map definitions 10 + * 11 + * This program is free software; you can redistribute it and/or modify 12 + * it under the terms of the GNU General Public License version 2 as 13 + * published by the Free Software Foundation. 14 + */ 15 + 16 + #define S3C2400_PA_MEMCTRL (0x14000000) 17 + #define S3C2400_PA_USBHOST (0x14200000) 18 + #define S3C2400_PA_IRQ (0x14400000) 19 + #define S3C2400_PA_DMA (0x14600000) 20 + #define S3C2400_PA_CLKPWR (0x14800000) 21 + #define S3C2400_PA_LCD (0x14A00000) 22 + #define S3C2400_PA_UART (0x15000000) 23 + #define S3C2400_PA_TIMER (0x15100000) 24 + #define S3C2400_PA_USBDEV (0x15200140) 25 + #define S3C2400_PA_WATCHDOG (0x15300000) 26 + #define S3C2400_PA_IIC (0x15400000) 27 + #define S3C2400_PA_IIS (0x15508000) 28 + #define S3C2400_PA_GPIO (0x15600000) 29 + #define S3C2400_PA_RTC (0x15700040) 30 + #define S3C2400_PA_ADC (0x15800000) 31 + #define S3C2400_PA_SPI (0x15900000) 32 + 33 + #define S3C2400_PA_MMC (0x15A00000) 34 + #define S3C2400_SZ_MMC SZ_1M 35 + 36 + /* physical addresses of all the chip-select areas */ 37 + 38 + #define S3C2400_CS0 (0x00000000) 39 + #define S3C2400_CS1 (0x02000000) 40 + #define S3C2400_CS2 (0x04000000) 41 + #define S3C2400_CS3 (0x06000000) 42 + #define S3C2400_CS4 (0x08000000) 43 + #define S3C2400_CS5 (0x0A000000) 44 + #define S3C2400_CS6 (0x0C000000) 45 + #define S3C2400_CS7 (0x0E000000) 46 + 47 + #define S3C2400_SDRAM_PA (S3C2400_CS6) 48 + 49 + /* Use a single interface for common resources between S3C24XX cpus */ 50 + 51 + #define S3C24XX_PA_IRQ S3C2400_PA_IRQ 52 + #define S3C24XX_PA_MEMCTRL S3C2400_PA_MEMCTRL 53 + #define S3C24XX_PA_USBHOST S3C2400_PA_USBHOST 54 + #define S3C24XX_PA_DMA S3C2400_PA_DMA 55 + #define S3C24XX_PA_CLKPWR S3C2400_PA_CLKPWR 56 + #define S3C24XX_PA_LCD S3C2400_PA_LCD 57 + #define S3C24XX_PA_UART S3C2400_PA_UART 58 + #define S3C24XX_PA_TIMER S3C2400_PA_TIMER 59 + #define S3C24XX_PA_USBDEV S3C2400_PA_USBDEV 60 + #define S3C24XX_PA_WATCHDOG S3C2400_PA_WATCHDOG 61 + #define S3C24XX_PA_IIC S3C2400_PA_IIC 62 + #define S3C24XX_PA_IIS S3C2400_PA_IIS 63 + #define S3C24XX_PA_GPIO S3C2400_PA_GPIO 64 + #define S3C24XX_PA_RTC S3C2400_PA_RTC 65 + #define S3C24XX_PA_ADC S3C2400_PA_ADC 66 + #define S3C24XX_PA_SPI S3C2400_PA_SPI
-51
include/asm-arm/arch-s3c2410/map.h
··· 30 #define S3C2410_ADDR(x) (0xF0000000 + (x)) 31 #endif 32 33 - #define S3C2400_ADDR(x) S3C2410_ADDR(x) 34 - 35 /* interrupt controller is the first thing we put in, to make 36 * the assembly code for the irq detection easier 37 */ 38 #define S3C24XX_VA_IRQ S3C2410_ADDR(0x00000000) 39 - #define S3C2400_PA_IRQ (0x14400000) 40 #define S3C2410_PA_IRQ (0x4A000000) 41 #define S3C24XX_SZ_IRQ SZ_1M 42 43 /* memory controller registers */ 44 #define S3C24XX_VA_MEMCTRL S3C2410_ADDR(0x00100000) 45 - #define S3C2400_PA_MEMCTRL (0x14000000) 46 #define S3C2410_PA_MEMCTRL (0x48000000) 47 #define S3C24XX_SZ_MEMCTRL SZ_1M 48 49 /* USB host controller */ 50 - #define S3C2400_PA_USBHOST (0x14200000) 51 #define S3C2410_PA_USBHOST (0x49000000) 52 #define S3C24XX_SZ_USBHOST SZ_1M 53 54 /* DMA controller */ 55 - #define S3C2400_PA_DMA (0x14600000) 56 #define S3C2410_PA_DMA (0x4B000000) 57 #define S3C24XX_SZ_DMA SZ_1M 58 59 /* Clock and Power management */ 60 #define S3C24XX_VA_CLKPWR S3C2410_ADDR(0x00200000) 61 - #define S3C2400_PA_CLKPWR (0x14800000) 62 #define S3C2410_PA_CLKPWR (0x4C000000) 63 #define S3C24XX_SZ_CLKPWR SZ_1M 64 65 /* LCD controller */ 66 #define S3C24XX_VA_LCD S3C2410_ADDR(0x00300000) 67 - #define S3C2400_PA_LCD (0x14A00000) 68 #define S3C2410_PA_LCD (0x4D000000) 69 #define S3C24XX_SZ_LCD SZ_1M 70 ··· 64 #define S3C2410_PA_NAND (0x4E000000) 65 #define S3C24XX_SZ_NAND SZ_1M 66 67 - /* MMC controller - available on the S3C2400 */ 68 - #define S3C2400_PA_MMC (0x15A00000) 69 - #define S3C2400_SZ_MMC SZ_1M 70 - 71 /* UARTs */ 72 #define S3C24XX_VA_UART S3C2410_ADDR(0x00400000) 73 - #define S3C2400_PA_UART (0x15000000) 74 #define S3C2410_PA_UART (0x50000000) 75 #define S3C24XX_SZ_UART SZ_1M 76 77 /* Timers */ 78 #define S3C24XX_VA_TIMER S3C2410_ADDR(0x00500000) 79 - #define S3C2400_PA_TIMER (0x15100000) 80 #define S3C2410_PA_TIMER (0x51000000) 81 #define S3C24XX_SZ_TIMER SZ_1M 82 83 /* USB Device port */ 84 #define S3C24XX_VA_USBDEV S3C2410_ADDR(0x00600000) 85 - #define S3C2400_PA_USBDEV (0x15200140) 86 #define S3C2410_PA_USBDEV (0x52000000) 87 #define S3C24XX_SZ_USBDEV SZ_1M 88 89 /* Watchdog */ 90 #define S3C24XX_VA_WATCHDOG S3C2410_ADDR(0x00700000) 91 - #define S3C2400_PA_WATCHDOG (0x15300000) 92 #define S3C2410_PA_WATCHDOG (0x53000000) 93 #define S3C24XX_SZ_WATCHDOG SZ_1M 94 95 /* IIC hardware controller */ 96 - #define S3C2400_PA_IIC (0x15400000) 97 #define S3C2410_PA_IIC (0x54000000) 98 #define S3C24XX_SZ_IIC SZ_1M 99 100 /* IIS controller */ 101 - #define S3C2400_PA_IIS (0x15508000) 102 #define S3C2410_PA_IIS (0x55000000) 103 #define S3C24XX_SZ_IIS SZ_1M 104 ··· 102 * by the base system. 103 */ 104 105 - #define S3C2400_PA_GPIO (0x15600000) 106 #define S3C2410_PA_GPIO (0x56000000) 107 #define S3C24XX_VA_GPIO ((S3C2410_PA_GPIO - S3C24XX_PA_UART) + S3C24XX_VA_UART) 108 #define S3C24XX_SZ_GPIO SZ_1M 109 110 /* RTC */ 111 - #define S3C2400_PA_RTC (0x15700040) 112 #define S3C2410_PA_RTC (0x57000000) 113 #define S3C24XX_SZ_RTC SZ_1M 114 115 /* ADC */ 116 - #define S3C2400_PA_ADC (0x15800000) 117 #define S3C2410_PA_ADC (0x58000000) 118 #define S3C24XX_SZ_ADC SZ_1M 119 120 /* SPI */ 121 - #define S3C2400_PA_SPI (0x15900000) 122 #define S3C2410_PA_SPI (0x59000000) 123 #define S3C24XX_SZ_SPI SZ_1M 124 ··· 155 156 #define S3C2410_SDRAM_PA (S3C2410_CS6) 157 158 - #define S3C2400_CS0 (0x00000000) 159 - #define S3C2400_CS1 (0x02000000) 160 - #define S3C2400_CS2 (0x04000000) 161 - #define S3C2400_CS3 (0x06000000) 162 - #define S3C2400_CS4 (0x08000000) 163 - #define S3C2400_CS5 (0x0A000000) 164 - #define S3C2400_CS6 (0x0C000000) 165 - #define S3C2400_CS7 (0x0E000000) 166 - 167 - #define S3C2400_SDRAM_PA (S3C2400_CS6) 168 169 /* Use a single interface for common resources between S3C24XX cpus */ 170 171 - #ifdef CONFIG_CPU_S3C2400 172 - #define S3C24XX_PA_IRQ S3C2400_PA_IRQ 173 - #define S3C24XX_PA_MEMCTRL S3C2400_PA_MEMCTRL 174 - #define S3C24XX_PA_USBHOST S3C2400_PA_USBHOST 175 - #define S3C24XX_PA_DMA S3C2400_PA_DMA 176 - #define S3C24XX_PA_CLKPWR S3C2400_PA_CLKPWR 177 - #define S3C24XX_PA_LCD S3C2400_PA_LCD 178 - #define S3C24XX_PA_UART S3C2400_PA_UART 179 - #define S3C24XX_PA_TIMER S3C2400_PA_TIMER 180 - #define S3C24XX_PA_USBDEV S3C2400_PA_USBDEV 181 - #define S3C24XX_PA_WATCHDOG S3C2400_PA_WATCHDOG 182 - #define S3C24XX_PA_IIC S3C2400_PA_IIC 183 - #define S3C24XX_PA_IIS S3C2400_PA_IIS 184 - #define S3C24XX_PA_GPIO S3C2400_PA_GPIO 185 - #define S3C24XX_PA_RTC S3C2400_PA_RTC 186 - #define S3C24XX_PA_ADC S3C2400_PA_ADC 187 - #define S3C24XX_PA_SPI S3C2400_PA_SPI 188 - #else 189 #define S3C24XX_PA_IRQ S3C2410_PA_IRQ 190 #define S3C24XX_PA_MEMCTRL S3C2410_PA_MEMCTRL 191 #define S3C24XX_PA_USBHOST S3C2410_PA_USBHOST ··· 174 #define S3C24XX_PA_RTC S3C2410_PA_RTC 175 #define S3C24XX_PA_ADC S3C2410_PA_ADC 176 #define S3C24XX_PA_SPI S3C2410_PA_SPI 177 - #endif 178 179 /* deal with the registers that move under the 2412/2413 */ 180
··· 30 #define S3C2410_ADDR(x) (0xF0000000 + (x)) 31 #endif 32 33 /* interrupt controller is the first thing we put in, to make 34 * the assembly code for the irq detection easier 35 */ 36 #define S3C24XX_VA_IRQ S3C2410_ADDR(0x00000000) 37 #define S3C2410_PA_IRQ (0x4A000000) 38 #define S3C24XX_SZ_IRQ SZ_1M 39 40 /* memory controller registers */ 41 #define S3C24XX_VA_MEMCTRL S3C2410_ADDR(0x00100000) 42 #define S3C2410_PA_MEMCTRL (0x48000000) 43 #define S3C24XX_SZ_MEMCTRL SZ_1M 44 45 /* USB host controller */ 46 #define S3C2410_PA_USBHOST (0x49000000) 47 #define S3C24XX_SZ_USBHOST SZ_1M 48 49 /* DMA controller */ 50 #define S3C2410_PA_DMA (0x4B000000) 51 #define S3C24XX_SZ_DMA SZ_1M 52 53 /* Clock and Power management */ 54 #define S3C24XX_VA_CLKPWR S3C2410_ADDR(0x00200000) 55 #define S3C2410_PA_CLKPWR (0x4C000000) 56 #define S3C24XX_SZ_CLKPWR SZ_1M 57 58 /* LCD controller */ 59 #define S3C24XX_VA_LCD S3C2410_ADDR(0x00300000) 60 #define S3C2410_PA_LCD (0x4D000000) 61 #define S3C24XX_SZ_LCD SZ_1M 62 ··· 72 #define S3C2410_PA_NAND (0x4E000000) 73 #define S3C24XX_SZ_NAND SZ_1M 74 75 /* UARTs */ 76 #define S3C24XX_VA_UART S3C2410_ADDR(0x00400000) 77 #define S3C2410_PA_UART (0x50000000) 78 #define S3C24XX_SZ_UART SZ_1M 79 80 /* Timers */ 81 #define S3C24XX_VA_TIMER S3C2410_ADDR(0x00500000) 82 #define S3C2410_PA_TIMER (0x51000000) 83 #define S3C24XX_SZ_TIMER SZ_1M 84 85 /* USB Device port */ 86 #define S3C24XX_VA_USBDEV S3C2410_ADDR(0x00600000) 87 #define S3C2410_PA_USBDEV (0x52000000) 88 #define S3C24XX_SZ_USBDEV SZ_1M 89 90 /* Watchdog */ 91 #define S3C24XX_VA_WATCHDOG S3C2410_ADDR(0x00700000) 92 #define S3C2410_PA_WATCHDOG (0x53000000) 93 #define S3C24XX_SZ_WATCHDOG SZ_1M 94 95 /* IIC hardware controller */ 96 #define S3C2410_PA_IIC (0x54000000) 97 #define S3C24XX_SZ_IIC SZ_1M 98 99 /* IIS controller */ 100 #define S3C2410_PA_IIS (0x55000000) 101 #define S3C24XX_SZ_IIS SZ_1M 102 ··· 120 * by the base system. 121 */ 122 123 #define S3C2410_PA_GPIO (0x56000000) 124 #define S3C24XX_VA_GPIO ((S3C2410_PA_GPIO - S3C24XX_PA_UART) + S3C24XX_VA_UART) 125 #define S3C24XX_SZ_GPIO SZ_1M 126 127 /* RTC */ 128 #define S3C2410_PA_RTC (0x57000000) 129 #define S3C24XX_SZ_RTC SZ_1M 130 131 /* ADC */ 132 #define S3C2410_PA_ADC (0x58000000) 133 #define S3C24XX_SZ_ADC SZ_1M 134 135 /* SPI */ 136 #define S3C2410_PA_SPI (0x59000000) 137 #define S3C24XX_SZ_SPI SZ_1M 138 ··· 177 178 #define S3C2410_SDRAM_PA (S3C2410_CS6) 179 180 181 /* Use a single interface for common resources between S3C24XX cpus */ 182 183 #define S3C24XX_PA_IRQ S3C2410_PA_IRQ 184 #define S3C24XX_PA_MEMCTRL S3C2410_PA_MEMCTRL 185 #define S3C24XX_PA_USBHOST S3C2410_PA_USBHOST ··· 224 #define S3C24XX_PA_RTC S3C2410_PA_RTC 225 #define S3C24XX_PA_ADC S3C2410_PA_ADC 226 #define S3C24XX_PA_SPI S3C2410_PA_SPI 227 228 /* deal with the registers that move under the 2412/2413 */ 229