Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[ARM] 4508/1: S3C: Move items to include/asm-arm/plat-s3c
This patch moves items of the s3c24xx support into
a new plat-s3c directory for items that use the
s3c24xx support but are not directly s3c24xx
compatible, such as the s3c2400 and s3c6400.
git mv commands:
git mv include/asm-arm/arch-s3c2410/iic.h include/asm-arm/plat-s3c/iic.h
git mv include/asm-arm/arch-s3c2410/nand.h include/asm-arm/plat-s3c/nand.h
git mv include/asm-arm/arch-s3c2410/regs-iic.h include/asm-arm/plat-s3c/regs-iic.h
git mv include/asm-arm/arch-s3c2410/regs-nand.h include/asm-arm/plat-s3c/regs-nand.h
git mv include/asm-arm/arch-s3c2410/regs-rtc.h include/asm-arm/plat-s3c/regs-rtc.h
git mv include/asm-arm/arch-s3c2410/regs-serial.h include/asm-arm/plat-s3c/regs-serial.h
git mv include/asm-arm/arch-s3c2410/regs-timer.h include/asm-arm/plat-s3c/regs-timer.h
git mv include/asm-arm/arch-s3c2410/regs-watchdog.h include/asm-arm/plat-s3c/regs-watchdog.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 531b617c 9a79b227
+1
-1
arch/arm/mach-s3c2410/clock.c
+1
-1
arch/arm/mach-s3c2410/clock.c
+1
-1
arch/arm/mach-s3c2410/dma.c
+1
-1
arch/arm/mach-s3c2410/dma.c
+1
-1
arch/arm/mach-s3c2410/mach-amlm5900.c
+1
-1
arch/arm/mach-s3c2410/mach-amlm5900.c
+3
-3
arch/arm/mach-s3c2410/mach-bast.c
+3
-3
arch/arm/mach-s3c2410/mach-bast.c
···
36
36
#include <asm/mach-types.h>
37
37
38
38
//#include <asm/debug-ll.h>
39
-
#include <asm/arch/regs-serial.h>
39
+
#include <asm/plat-s3c/regs-serial.h>
40
40
#include <asm/arch/regs-gpio.h>
41
41
#include <asm/arch/regs-mem.h>
42
42
#include <asm/arch/regs-lcd.h>
43
43
44
-
#include <asm/arch/nand.h>
45
-
#include <asm/arch/iic.h>
44
+
#include <asm/plat-s3c/nand.h>
45
+
#include <asm/plat-s3c/iic.h>
46
46
#include <asm/arch/fb.h>
47
47
48
48
#include <linux/mtd/mtd.h>
+1
-1
arch/arm/mach-s3c2410/mach-h1940.c
+1
-1
arch/arm/mach-s3c2410/mach-h1940.c
+2
-2
arch/arm/mach-s3c2410/mach-n30.c
+2
-2
arch/arm/mach-s3c2410/mach-n30.c
···
33
33
#include <asm/irq.h>
34
34
#include <asm/mach-types.h>
35
35
36
-
#include <asm/arch/regs-serial.h>
36
+
#include <asm/plat-s3c/regs-serial.h>
37
37
#include <asm/arch/regs-gpio.h>
38
-
#include <asm/arch/iic.h>
38
+
#include <asm/plat-s3c/iic.h>
39
39
40
40
#include <asm/plat-s3c24xx/s3c2410.h>
41
41
#include <asm/plat-s3c24xx/clock.h>
+1
-1
arch/arm/mach-s3c2410/mach-otom.c
+1
-1
arch/arm/mach-s3c2410/mach-otom.c
+2
-2
arch/arm/mach-s3c2410/mach-qt2410.c
+2
-2
arch/arm/mach-s3c2410/mach-qt2410.c
···
49
49
50
50
#include <asm/arch/regs-gpio.h>
51
51
#include <asm/arch/leds-gpio.h>
52
-
#include <asm/arch/regs-serial.h>
52
+
#include <asm/plat-s3c/regs-serial.h>
53
53
#include <asm/arch/fb.h>
54
-
#include <asm/arch/nand.h>
54
+
#include <asm/plat-s3c/nand.h>
55
55
#include <asm/arch/udc.h>
56
56
#include <asm/arch/spi.h>
57
57
#include <asm/arch/spi-gpio.h>
+1
-1
arch/arm/mach-s3c2410/mach-smdk2410.c
+1
-1
arch/arm/mach-s3c2410/mach-smdk2410.c
+1
-1
arch/arm/mach-s3c2410/mach-vr1000.c
+1
-1
arch/arm/mach-s3c2410/mach-vr1000.c
+1
-2
arch/arm/mach-s3c2410/s3c2410.c
+1
-2
arch/arm/mach-s3c2410/s3c2410.c
···
29
29
#include <asm/irq.h>
30
30
31
31
#include <asm/arch/regs-clock.h>
32
-
#include <asm/arch/regs-serial.h>
32
+
#include <asm/plat-s3c/regs-serial.h>
33
33
34
34
#include <asm/plat-s3c24xx/s3c2410.h>
35
35
#include <asm/plat-s3c24xx/cpu.h>
···
40
40
41
41
static struct map_desc s3c2410_iodesc[] __initdata = {
42
42
IODESC_ENT(CLKPWR),
43
-
IODESC_ENT(LCD),
44
43
IODESC_ENT(TIMER),
45
44
IODESC_ENT(WATCHDOG),
46
45
};
+1
-1
arch/arm/mach-s3c2410/sleep.S
+1
-1
arch/arm/mach-s3c2410/sleep.S
+1
-1
arch/arm/mach-s3c2412/clock.c
+1
-1
arch/arm/mach-s3c2412/clock.c
+1
-1
arch/arm/mach-s3c2412/dma.c
+1
-1
arch/arm/mach-s3c2412/dma.c
+1
-1
arch/arm/mach-s3c2412/mach-smdk2413.c
+1
-1
arch/arm/mach-s3c2412/mach-smdk2413.c
+2
-2
arch/arm/mach-s3c2412/mach-vstms.c
+2
-2
arch/arm/mach-s3c2412/mach-vstms.c
···
33
33
#include <asm/irq.h>
34
34
#include <asm/mach-types.h>
35
35
36
-
#include <asm/arch/regs-serial.h>
36
+
#include <asm/plat-s3c/regs-serial.h>
37
37
#include <asm/arch/regs-gpio.h>
38
38
#include <asm/arch/regs-lcd.h>
39
39
40
40
#include <asm/arch/idle.h>
41
41
#include <asm/arch/fb.h>
42
42
43
-
#include <asm/arch/nand.h>
43
+
#include <asm/plat-s3c/nand.h>
44
44
45
45
#include <asm/plat-s3c24xx/s3c2410.h>
46
46
#include <asm/plat-s3c24xx/s3c2412.h>
+1
-1
arch/arm/mach-s3c2412/s3c2412.c
+1
-1
arch/arm/mach-s3c2412/s3c2412.c
+1
-1
arch/arm/mach-s3c2440/dma.c
+1
-1
arch/arm/mach-s3c2440/dma.c
+2
-2
arch/arm/mach-s3c2440/mach-anubis.c
+2
-2
arch/arm/mach-s3c2440/mach-anubis.c
···
34
34
#include <asm/irq.h>
35
35
#include <asm/mach-types.h>
36
36
37
-
#include <asm/arch/regs-serial.h>
37
+
#include <asm/plat-s3c/regs-serial.h>
38
38
#include <asm/arch/regs-gpio.h>
39
39
#include <asm/arch/regs-mem.h>
40
40
#include <asm/arch/regs-lcd.h>
41
-
#include <asm/arch/nand.h>
41
+
#include <asm/plat-s3c/nand.h>
42
42
43
43
#include <linux/mtd/mtd.h>
44
44
#include <linux/mtd/nand.h>
+1
-1
arch/arm/mach-s3c2440/mach-nexcoder.c
+1
-1
arch/arm/mach-s3c2440/mach-nexcoder.c
+2
-2
arch/arm/mach-s3c2440/mach-osiris.c
+2
-2
arch/arm/mach-s3c2440/mach-osiris.c
···
31
31
#include <asm/irq.h>
32
32
#include <asm/mach-types.h>
33
33
34
-
#include <asm/arch/regs-serial.h>
34
+
#include <asm/plat-s3c/regs-serial.h>
35
35
#include <asm/arch/regs-gpio.h>
36
36
#include <asm/arch/regs-mem.h>
37
37
#include <asm/arch/regs-lcd.h>
38
-
#include <asm/arch/nand.h>
38
+
#include <asm/plat-s3c/nand.h>
39
39
40
40
#include <linux/mtd/mtd.h>
41
41
#include <linux/mtd/nand.h>
+2
-2
arch/arm/mach-s3c2440/mach-rx3715.c
+2
-2
arch/arm/mach-s3c2440/mach-rx3715.c
···
38
38
#include <asm/irq.h>
39
39
#include <asm/mach-types.h>
40
40
41
-
#include <asm/arch/regs-serial.h>
41
+
#include <asm/plat-s3c/regs-serial.h>
42
42
#include <asm/arch/regs-gpio.h>
43
43
#include <asm/arch/regs-lcd.h>
44
44
45
45
#include <asm/arch/h1940.h>
46
-
#include <asm/arch/nand.h>
46
+
#include <asm/plat-s3c/nand.h>
47
47
#include <asm/arch/fb.h>
48
48
49
49
#include <asm/plat-s3c24xx/clock.h>
+1
-1
arch/arm/mach-s3c2440/mach-smdk2440.c
+1
-1
arch/arm/mach-s3c2440/mach-smdk2440.c
+1
-1
arch/arm/mach-s3c2443/dma.c
+1
-1
arch/arm/mach-s3c2443/dma.c
+1
-1
arch/arm/mach-s3c2443/mach-smdk2443.c
+1
-1
arch/arm/mach-s3c2443/mach-smdk2443.c
+1
-1
arch/arm/plat-s3c24xx/common-smdk.c
+1
-1
arch/arm/plat-s3c24xx/common-smdk.c
+1
-1
arch/arm/plat-s3c24xx/cpu.c
+1
-1
arch/arm/plat-s3c24xx/cpu.c
+1
-1
arch/arm/plat-s3c24xx/devs.c
+1
-1
arch/arm/plat-s3c24xx/devs.c
+1
-1
arch/arm/plat-s3c24xx/pm.c
+1
-1
arch/arm/plat-s3c24xx/pm.c
+1
-1
arch/arm/plat-s3c24xx/s3c244x.c
+1
-1
arch/arm/plat-s3c24xx/s3c244x.c
+1
-1
arch/arm/plat-s3c24xx/sleep.S
+1
-1
arch/arm/plat-s3c24xx/sleep.S
···
32
32
#include <asm/arch/regs-gpio.h>
33
33
#include <asm/arch/regs-clock.h>
34
34
#include <asm/arch/regs-mem.h>
35
-
#include <asm/arch/regs-serial.h>
35
+
#include <asm/plat-s3c/regs-serial.h>
36
36
37
37
/* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not
38
38
* reset the UART configuration, only enable if you really need this!
+1
-1
arch/arm/plat-s3c24xx/time.c
+1
-1
arch/arm/plat-s3c24xx/time.c
+1
-1
drivers/serial/s3c2410.c
+1
-1
drivers/serial/s3c2410.c
+1
-1
include/asm-arm/arch-s3c2410/debug-macro.S
+1
-1
include/asm-arm/arch-s3c2410/debug-macro.S
include/asm-arm/arch-s3c2410/iic.h
include/asm-arm/plat-s3c/iic.h
include/asm-arm/arch-s3c2410/iic.h
include/asm-arm/plat-s3c/iic.h
include/asm-arm/arch-s3c2410/nand.h
include/asm-arm/plat-s3c/nand.h
include/asm-arm/arch-s3c2410/nand.h
include/asm-arm/plat-s3c/nand.h
include/asm-arm/arch-s3c2410/regs-iic.h
include/asm-arm/plat-s3c/regs-iic.h
include/asm-arm/arch-s3c2410/regs-iic.h
include/asm-arm/plat-s3c/regs-iic.h
include/asm-arm/arch-s3c2410/regs-nand.h
include/asm-arm/plat-s3c/regs-nand.h
include/asm-arm/arch-s3c2410/regs-nand.h
include/asm-arm/plat-s3c/regs-nand.h
include/asm-arm/arch-s3c2410/regs-rtc.h
include/asm-arm/plat-s3c/regs-rtc.h
include/asm-arm/arch-s3c2410/regs-rtc.h
include/asm-arm/plat-s3c/regs-rtc.h
include/asm-arm/arch-s3c2410/regs-serial.h
include/asm-arm/plat-s3c/regs-serial.h
include/asm-arm/arch-s3c2410/regs-serial.h
include/asm-arm/plat-s3c/regs-serial.h
include/asm-arm/arch-s3c2410/regs-timer.h
include/asm-arm/plat-s3c/regs-timer.h
include/asm-arm/arch-s3c2410/regs-timer.h
include/asm-arm/plat-s3c/regs-timer.h
include/asm-arm/arch-s3c2410/regs-watchdog.h
include/asm-arm/plat-s3c/regs-watchdog.h
include/asm-arm/arch-s3c2410/regs-watchdog.h
include/asm-arm/plat-s3c/regs-watchdog.h
+1
-1
include/asm-arm/arch-s3c2410/system.h
+1
-1
include/asm-arm/arch-s3c2410/system.h
+2
-2
include/asm-arm/arch-s3c2410/uncompress.h
+2
-2
include/asm-arm/arch-s3c2410/uncompress.h
···
16
16
typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
17
17
18
18
/* defines for UART registers */
19
-
#include "asm/arch/regs-serial.h"
19
+
#include "asm/plat-s3c/regs-serial.h"
20
20
#include "asm/arch/regs-gpio.h"
21
-
#include "asm/arch/regs-watchdog.h"
21
+
#include "asm/plat-s3c/regs-watchdog.h"
22
22
23
23
#include <asm/arch/map.h>
24
24