tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] 4524/1: S3C: Move register out of include/asm-arm/arch-s3c2410

Move register and other definitions out of the
include/asm-arm/arch-s3c2410 into the the arch
directories of include/asm-arm/plat-s3c24xx and
include/asm-arm/plat-s3c.

This move is in preperation of the merging of
s3c2400 and s3c6400.

The following git mv commands are needed before
this patch can be applied:

git mv include/asm-arm/arch-s3c2410/regs-ac97.h include/asm-arm/plat-s3c/regs-ac97.h
git mv include/asm-arm/arch-s3c2410/regs-adc.h include/asm-arm/plat-s3c/regs-adc.h
git mv include/asm-arm/arch-s3c2410/regs-iis.h include/asm-arm/plat-s3c24xx/regs-iis.h
git mv include/asm-arm/arch-s3c2410/regs-spi.h include/asm-arm/plat-s3c24xx/regs-spi.h
git mv include/asm-arm/arch-s3c2410/regs-udc.h include/asm-arm/plat-s3c24xx/regs-udc.h
git mv include/asm-arm/arch-s3c2410/udc.h include/asm-arm/plat-s3c24xx/udc.h

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 06cfa556 dd1313a1

+18 -18
unified split
+3 -3
arch/arm/mach-s3c2410/dma.c
··· 25 25 26 26 #include <asm/plat-s3c/regs-serial.h> 27 27 #include <asm/arch/regs-gpio.h> 28 - #include <asm/arch/regs-ac97.h> 28 + #include <asm/plat-s3c/regs-ac97.h> 29 29 #include <asm/arch/regs-mem.h> 30 30 #include <asm/arch/regs-lcd.h> 31 31 #include <asm/arch/regs-sdi.h> 32 - #include <asm/arch/regs-iis.h> 33 - #include <asm/arch/regs-spi.h> 32 + #include <asm/plat-s3c24xx/regs-iis.h> 33 + #include <asm/plat-s3c24xx/regs-spi.h> 34 34 35 35 static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { 36 36 [DMACH_XD0] = {
+1 -1
arch/arm/mach-s3c2410/mach-h1940.c
··· 38 38 #include <asm/arch/h1940.h> 39 39 #include <asm/arch/h1940-latch.h> 40 40 #include <asm/arch/fb.h> 41 - #include <asm/arch/udc.h> 41 + #include <asm/plat-s3c24xx/udc.h> 42 42 43 43 #include <asm/plat-s3c24xx/clock.h> 44 44 #include <asm/plat-s3c24xx/devs.h>
+1 -1
arch/arm/mach-s3c2410/mach-qt2410.c
··· 52 52 #include <asm/plat-s3c/regs-serial.h> 53 53 #include <asm/arch/fb.h> 54 54 #include <asm/plat-s3c/nand.h> 55 - #include <asm/arch/udc.h> 55 + #include <asm/plat-s3c24xx/udc.h> 56 56 #include <asm/arch/spi.h> 57 57 #include <asm/arch/spi-gpio.h> 58 58
+3 -3
arch/arm/mach-s3c2412/dma.c
··· 26 26 27 27 #include <asm/plat-s3c/regs-serial.h> 28 28 #include <asm/arch/regs-gpio.h> 29 - #include <asm/arch/regs-ac97.h> 29 + #include <asm/plat-s3c/regs-ac97.h> 30 30 #include <asm/arch/regs-mem.h> 31 31 #include <asm/arch/regs-lcd.h> 32 32 #include <asm/arch/regs-sdi.h> 33 - #include <asm/arch/regs-iis.h> 34 - #include <asm/arch/regs-spi.h> 33 + #include <asm/plat-s3c24xx/regs-iis.h> 34 + #include <asm/plat-s3c24xx/regs-spi.h> 35 35 36 36 #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } 37 37
+1 -1
arch/arm/mach-s3c2412/mach-smdk2413.c
··· 37 37 #include <asm/arch/regs-lcd.h> 38 38 39 39 #include <asm/arch/idle.h> 40 - #include <asm/arch/udc.h> 40 + #include <asm/plat-s3c24xx/udc.h> 41 41 #include <asm/arch/fb.h> 42 42 43 43 #include <asm/plat-s3c24xx/s3c2410.h>
+1 -1
arch/arm/mach-s3c2412/s3c2412.c
··· 39 39 #include <asm/arch/regs-gpio.h> 40 40 #include <asm/arch/regs-gpioj.h> 41 41 #include <asm/arch/regs-dsc.h> 42 - #include <asm/arch/regs-spi.h> 42 + #include <asm/plat-s3c24xx/regs-spi.h> 43 43 #include <asm/arch/regs-s3c2412.h> 44 44 45 45 #include <asm/plat-s3c24xx/s3c2412.h>
+3 -3
arch/arm/mach-s3c2440/dma.c
··· 25 25 26 26 #include <asm/plat-s3c/regs-serial.h> 27 27 #include <asm/arch/regs-gpio.h> 28 - #include <asm/arch/regs-ac97.h> 28 + #include <asm/plat-s3c/regs-ac97.h> 29 29 #include <asm/arch/regs-mem.h> 30 30 #include <asm/arch/regs-lcd.h> 31 31 #include <asm/arch/regs-sdi.h> 32 - #include <asm/arch/regs-iis.h> 33 - #include <asm/arch/regs-spi.h> 32 + #include <asm/plat-s3c24xx/regs-iis.h> 33 + #include <asm/plat-s3c24xx/regs-spi.h> 34 34 35 35 static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { 36 36 [DMACH_XD0] = {
+3 -3
arch/arm/mach-s3c2443/dma.c
··· 26 26 27 27 #include <asm/plat-s3c/regs-serial.h> 28 28 #include <asm/arch/regs-gpio.h> 29 - #include <asm/arch/regs-ac97.h> 29 + #include <asm/plat-s3c/regs-ac97.h> 30 30 #include <asm/arch/regs-mem.h> 31 31 #include <asm/arch/regs-lcd.h> 32 32 #include <asm/arch/regs-sdi.h> 33 - #include <asm/arch/regs-iis.h> 34 - #include <asm/arch/regs-spi.h> 33 + #include <asm/plat-s3c24xx/regs-iis.h> 34 + #include <asm/plat-s3c24xx/regs-spi.h> 35 35 36 36 #define MAP(x) { \ 37 37 [0] = (x) | DMA_CH_VALID, \
+2 -2
arch/arm/plat-s3c24xx/devs.c
··· 29 29 #include <asm/irq.h> 30 30 31 31 #include <asm/plat-s3c/regs-serial.h> 32 - #include <asm/arch/udc.h> 32 + #include <asm/plat-s3c24xx/udc.h> 33 33 34 34 #include <asm/plat-s3c24xx/devs.h> 35 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 38 /* Serial port registrations */ 39 39
include/asm-arm/arch-s3c2410/regs-ac97.h include/asm-arm/plat-s3c/regs-ac97.h
include/asm-arm/arch-s3c2410/regs-adc.h include/asm-arm/plat-s3c/regs-adc.h
include/asm-arm/arch-s3c2410/regs-iis.h include/asm-arm/plat-s3c24xx/regs-iis.h
include/asm-arm/arch-s3c2410/regs-spi.h include/asm-arm/plat-s3c24xx/regs-spi.h
include/asm-arm/arch-s3c2410/regs-udc.h include/asm-arm/plat-s3c24xx/regs-udc.h
include/asm-arm/arch-s3c2410/udc.h include/asm-arm/plat-s3c24xx/udc.h