diff options
| -rw-r--r-- | arch/arm/mach-s3c2410/dma.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-qt2410.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/dma.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-smdk2413.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/s3c2412.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/dma.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2443/dma.c | 6 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 4 | ||||
| -rw-r--r-- | include/asm-arm/plat-s3c/regs-ac97.h (renamed from include/asm-arm/arch-s3c2410/regs-ac97.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/plat-s3c/regs-adc.h (renamed from include/asm-arm/arch-s3c2410/regs-adc.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/plat-s3c24xx/regs-iis.h (renamed from include/asm-arm/arch-s3c2410/regs-iis.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/plat-s3c24xx/regs-spi.h (renamed from include/asm-arm/arch-s3c2410/regs-spi.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/plat-s3c24xx/regs-udc.h (renamed from include/asm-arm/arch-s3c2410/regs-udc.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/plat-s3c24xx/udc.h (renamed from include/asm-arm/arch-s3c2410/udc.h) | 0 |
15 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index 5620ca4d108..80d83739ab9 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c | |||
| @@ -25,12 +25,12 @@ | |||
| 25 | 25 | ||
| 26 | #include <asm/plat-s3c/regs-serial.h> | 26 | #include <asm/plat-s3c/regs-serial.h> |
| 27 | #include <asm/arch/regs-gpio.h> | 27 | #include <asm/arch/regs-gpio.h> |
| 28 | #include <asm/arch/regs-ac97.h> | 28 | #include <asm/plat-s3c/regs-ac97.h> |
| 29 | #include <asm/arch/regs-mem.h> | 29 | #include <asm/arch/regs-mem.h> |
| 30 | #include <asm/arch/regs-lcd.h> | 30 | #include <asm/arch/regs-lcd.h> |
| 31 | #include <asm/arch/regs-sdi.h> | 31 | #include <asm/arch/regs-sdi.h> |
| 32 | #include <asm/arch/regs-iis.h> | 32 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 33 | #include <asm/arch/regs-spi.h> | 33 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 34 | 34 | ||
| 35 | static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { | 35 | static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { |
| 36 | [DMACH_XD0] = { | 36 | [DMACH_XD0] = { |
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 4102235e085..9a172b4ad72 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <asm/arch/h1940.h> | 38 | #include <asm/arch/h1940.h> |
| 39 | #include <asm/arch/h1940-latch.h> | 39 | #include <asm/arch/h1940-latch.h> |
| 40 | #include <asm/arch/fb.h> | 40 | #include <asm/arch/fb.h> |
| 41 | #include <asm/arch/udc.h> | 41 | #include <asm/plat-s3c24xx/udc.h> |
| 42 | 42 | ||
| 43 | #include <asm/plat-s3c24xx/clock.h> | 43 | #include <asm/plat-s3c24xx/clock.h> |
| 44 | #include <asm/plat-s3c24xx/devs.h> | 44 | #include <asm/plat-s3c24xx/devs.h> |
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c index 6cb4a0d2cb4..e670b1e1631 100644 --- a/arch/arm/mach-s3c2410/mach-qt2410.c +++ b/arch/arm/mach-s3c2410/mach-qt2410.c | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | #include <asm/plat-s3c/regs-serial.h> | 52 | #include <asm/plat-s3c/regs-serial.h> |
| 53 | #include <asm/arch/fb.h> | 53 | #include <asm/arch/fb.h> |
| 54 | #include <asm/plat-s3c/nand.h> | 54 | #include <asm/plat-s3c/nand.h> |
| 55 | #include <asm/arch/udc.h> | 55 | #include <asm/plat-s3c24xx/udc.h> |
| 56 | #include <asm/arch/spi.h> | 56 | #include <asm/arch/spi.h> |
| 57 | #include <asm/arch/spi-gpio.h> | 57 | #include <asm/arch/spi-gpio.h> |
| 58 | 58 | ||
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index 48413df88e2..4b9425c1bf7 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c | |||
| @@ -26,12 +26,12 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/plat-s3c/regs-serial.h> | 27 | #include <asm/plat-s3c/regs-serial.h> |
| 28 | #include <asm/arch/regs-gpio.h> | 28 | #include <asm/arch/regs-gpio.h> |
| 29 | #include <asm/arch/regs-ac97.h> | 29 | #include <asm/plat-s3c/regs-ac97.h> |
| 30 | #include <asm/arch/regs-mem.h> | 30 | #include <asm/arch/regs-mem.h> |
| 31 | #include <asm/arch/regs-lcd.h> | 31 | #include <asm/arch/regs-lcd.h> |
| 32 | #include <asm/arch/regs-sdi.h> | 32 | #include <asm/arch/regs-sdi.h> |
| 33 | #include <asm/arch/regs-iis.h> | 33 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 34 | #include <asm/arch/regs-spi.h> | 34 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 35 | 35 | ||
| 36 | #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } | 36 | #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } |
| 37 | 37 | ||
diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index bbc609c3e62..b126a530daa 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <asm/arch/regs-lcd.h> | 37 | #include <asm/arch/regs-lcd.h> |
| 38 | 38 | ||
| 39 | #include <asm/arch/idle.h> | 39 | #include <asm/arch/idle.h> |
| 40 | #include <asm/arch/udc.h> | 40 | #include <asm/plat-s3c24xx/udc.h> |
| 41 | #include <asm/arch/fb.h> | 41 | #include <asm/arch/fb.h> |
| 42 | 42 | ||
| 43 | #include <asm/plat-s3c24xx/s3c2410.h> | 43 | #include <asm/plat-s3c24xx/s3c2410.h> |
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c index 66f471a9d64..e0ccb404623 100644 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <asm/arch/regs-gpio.h> | 39 | #include <asm/arch/regs-gpio.h> |
| 40 | #include <asm/arch/regs-gpioj.h> | 40 | #include <asm/arch/regs-gpioj.h> |
| 41 | #include <asm/arch/regs-dsc.h> | 41 | #include <asm/arch/regs-dsc.h> |
| 42 | #include <asm/arch/regs-spi.h> | 42 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 43 | #include <asm/arch/regs-s3c2412.h> | 43 | #include <asm/arch/regs-s3c2412.h> |
| 44 | 44 | ||
| 45 | #include <asm/plat-s3c24xx/s3c2412.h> | 45 | #include <asm/plat-s3c24xx/s3c2412.h> |
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index 13e4be3392b..f509f062e74 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c | |||
| @@ -25,12 +25,12 @@ | |||
| 25 | 25 | ||
| 26 | #include <asm/plat-s3c/regs-serial.h> | 26 | #include <asm/plat-s3c/regs-serial.h> |
| 27 | #include <asm/arch/regs-gpio.h> | 27 | #include <asm/arch/regs-gpio.h> |
| 28 | #include <asm/arch/regs-ac97.h> | 28 | #include <asm/plat-s3c/regs-ac97.h> |
| 29 | #include <asm/arch/regs-mem.h> | 29 | #include <asm/arch/regs-mem.h> |
| 30 | #include <asm/arch/regs-lcd.h> | 30 | #include <asm/arch/regs-lcd.h> |
| 31 | #include <asm/arch/regs-sdi.h> | 31 | #include <asm/arch/regs-sdi.h> |
| 32 | #include <asm/arch/regs-iis.h> | 32 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 33 | #include <asm/arch/regs-spi.h> | 33 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 34 | 34 | ||
| 35 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { | 35 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { |
| 36 | [DMACH_XD0] = { | 36 | [DMACH_XD0] = { |
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c index d8bb4345b48..fc3ede82af8 100644 --- a/arch/arm/mach-s3c2443/dma.c +++ b/arch/arm/mach-s3c2443/dma.c | |||
| @@ -26,12 +26,12 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/plat-s3c/regs-serial.h> | 27 | #include <asm/plat-s3c/regs-serial.h> |
| 28 | #include <asm/arch/regs-gpio.h> | 28 | #include <asm/arch/regs-gpio.h> |
| 29 | #include <asm/arch/regs-ac97.h> | 29 | #include <asm/plat-s3c/regs-ac97.h> |
| 30 | #include <asm/arch/regs-mem.h> | 30 | #include <asm/arch/regs-mem.h> |
| 31 | #include <asm/arch/regs-lcd.h> | 31 | #include <asm/arch/regs-lcd.h> |
| 32 | #include <asm/arch/regs-sdi.h> | 32 | #include <asm/arch/regs-sdi.h> |
| 33 | #include <asm/arch/regs-iis.h> | 33 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 34 | #include <asm/arch/regs-spi.h> | 34 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 35 | 35 | ||
| 36 | #define MAP(x) { \ | 36 | #define MAP(x) { \ |
| 37 | [0] = (x) | DMA_CH_VALID, \ | 37 | [0] = (x) | DMA_CH_VALID, \ |
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index 9941508614e..e546e933b3f 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
| @@ -29,11 +29,11 @@ | |||
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | 30 | ||
| 31 | #include <asm/plat-s3c/regs-serial.h> | 31 | #include <asm/plat-s3c/regs-serial.h> |
| 32 | #include <asm/arch/udc.h> | 32 | #include <asm/plat-s3c24xx/udc.h> |
| 33 | 33 | ||
| 34 | #include <asm/plat-s3c24xx/devs.h> | 34 | #include <asm/plat-s3c24xx/devs.h> |
| 35 | #include <asm/plat-s3c24xx/cpu.h> | 35 | #include <asm/plat-s3c24xx/cpu.h> |
| 36 | #include <asm/arch/regs-spi.h> | 36 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 37 | 37 | ||
| 38 | /* Serial port registrations */ | 38 | /* Serial port registrations */ |
| 39 | 39 | ||
diff --git a/include/asm-arm/arch-s3c2410/regs-ac97.h b/include/asm-arm/plat-s3c/regs-ac97.h index b004dee6bca..b004dee6bca 100644 --- a/include/asm-arm/arch-s3c2410/regs-ac97.h +++ b/include/asm-arm/plat-s3c/regs-ac97.h | |||
diff --git a/include/asm-arm/arch-s3c2410/regs-adc.h b/include/asm-arm/plat-s3c/regs-adc.h index c7f231963e7..c7f231963e7 100644 --- a/include/asm-arm/arch-s3c2410/regs-adc.h +++ b/include/asm-arm/plat-s3c/regs-adc.h | |||
diff --git a/include/asm-arm/arch-s3c2410/regs-iis.h b/include/asm-arm/plat-s3c24xx/regs-iis.h index eaf77916a60..eaf77916a60 100644 --- a/include/asm-arm/arch-s3c2410/regs-iis.h +++ b/include/asm-arm/plat-s3c24xx/regs-iis.h | |||
diff --git a/include/asm-arm/arch-s3c2410/regs-spi.h b/include/asm-arm/plat-s3c24xx/regs-spi.h index 4a499a13825..4a499a13825 100644 --- a/include/asm-arm/arch-s3c2410/regs-spi.h +++ b/include/asm-arm/plat-s3c24xx/regs-spi.h | |||
diff --git a/include/asm-arm/arch-s3c2410/regs-udc.h b/include/asm-arm/plat-s3c24xx/regs-udc.h index e1e9805d2d9..e1e9805d2d9 100644 --- a/include/asm-arm/arch-s3c2410/regs-udc.h +++ b/include/asm-arm/plat-s3c24xx/regs-udc.h | |||
diff --git a/include/asm-arm/arch-s3c2410/udc.h b/include/asm-arm/plat-s3c24xx/udc.h index b8aa6cb69b5..b8aa6cb69b5 100644 --- a/include/asm-arm/arch-s3c2410/udc.h +++ b/include/asm-arm/plat-s3c24xx/udc.h | |||