diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-07 17:26:09 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-07 17:26:09 -0400 |
commit | a2b7ba9ca471438c2bb0c3bdf0ff2ed7fdce3d2f (patch) | |
tree | 65ad52e682b45c7fdfbd6725a34546b29f4dc907 /arch/arm/mach-s3c2412 | |
parent | 4330ed8ed4da360ac1ca14b0fddff4c05b10de16 (diff) |
[ARM] S3C24XX: Move files out of include/asm-arm/plat-s3c*
First move of items out of include/asm-arm/plat-s3c* to their
new homes under arch/arm/plat-s3c/include/plat and
arch/arm/plat-s3c24xx/include/plat directories.
Note, we have to create a dummy arch/arm/plat-s3c/Makefile to
allow us to add arch/arm/plat-s3c/include/plat to the path.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2412')
-rw-r--r-- | arch/arm/mach-s3c2412/clock.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/dma.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/irq.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/mach-jive.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/mach-smdk2413.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/mach-vstms.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/pm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/s3c2412.c | 8 |
8 files changed, 25 insertions, 25 deletions
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c index af4b2ce516f9..8b3382d24799 100644 --- a/arch/arm/mach-s3c2412/clock.c +++ b/arch/arm/mach-s3c2412/clock.c | |||
@@ -37,13 +37,13 @@ | |||
37 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
38 | #include <asm/io.h> | 38 | #include <asm/io.h> |
39 | 39 | ||
40 | #include <asm/plat-s3c/regs-serial.h> | 40 | #include <plat/regs-serial.h> |
41 | #include <mach/regs-clock.h> | 41 | #include <mach/regs-clock.h> |
42 | #include <mach/regs-gpio.h> | 42 | #include <mach/regs-gpio.h> |
43 | 43 | ||
44 | #include <asm/plat-s3c24xx/s3c2412.h> | 44 | #include <asm/plat-s3c24xx/s3c2412.h> |
45 | #include <asm/plat-s3c24xx/clock.h> | 45 | #include <asm/plat-s3c24xx/clock.h> |
46 | #include <asm/plat-s3c24xx/cpu.h> | 46 | #include <plat/cpu.h> |
47 | 47 | ||
48 | /* We currently have to assume that the system is running | 48 | /* We currently have to assume that the system is running |
49 | * from the XTPll input, and that all ***REFCLKs are being | 49 | * from the XTPll input, and that all ***REFCLKs are being |
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index 22fc04a3b533..d4af572f22fd 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c | |||
@@ -22,9 +22,9 @@ | |||
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | 23 | ||
24 | #include <asm/plat-s3c24xx/dma.h> | 24 | #include <asm/plat-s3c24xx/dma.h> |
25 | #include <asm/plat-s3c24xx/cpu.h> | 25 | #include <plat/cpu.h> |
26 | 26 | ||
27 | #include <asm/plat-s3c/regs-serial.h> | 27 | #include <plat/regs-serial.h> |
28 | #include <mach/regs-gpio.h> | 28 | #include <mach/regs-gpio.h> |
29 | #include <asm/plat-s3c/regs-ac97.h> | 29 | #include <asm/plat-s3c/regs-ac97.h> |
30 | #include <mach/regs-mem.h> | 30 | #include <mach/regs-mem.h> |
diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c index ac62b79044f4..936fac7600e3 100644 --- a/arch/arm/mach-s3c2412/irq.c +++ b/arch/arm/mach-s3c2412/irq.c | |||
@@ -35,9 +35,9 @@ | |||
35 | #include <mach/regs-gpio.h> | 35 | #include <mach/regs-gpio.h> |
36 | #include <mach/regs-power.h> | 36 | #include <mach/regs-power.h> |
37 | 37 | ||
38 | #include <asm/plat-s3c24xx/cpu.h> | 38 | #include <plat/cpu.h> |
39 | #include <asm/plat-s3c24xx/irq.h> | 39 | #include <plat/irq.h> |
40 | #include <asm/plat-s3c24xx/pm.h> | 40 | #include <plat/pm.h> |
41 | 41 | ||
42 | #define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1) | 42 | #define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1) |
43 | #define INTMSK_SUB(start, end) (INTMSK(start, end) << ((start - S3C2410_IRQSUB(0)))) | 43 | #define INTMSK_SUB(start, end) (INTMSK(start, end) << ((start - S3C2410_IRQSUB(0)))) |
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index ad980a1690c2..246c6dbcd87c 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
31 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
32 | 32 | ||
33 | #include <asm/plat-s3c/regs-serial.h> | 33 | #include <plat/regs-serial.h> |
34 | #include <asm/plat-s3c/nand.h> | 34 | #include <asm/plat-s3c/nand.h> |
35 | #include <asm/plat-s3c/iic.h> | 35 | #include <asm/plat-s3c/iic.h> |
36 | 36 | ||
@@ -49,9 +49,9 @@ | |||
49 | #include <linux/mtd/partitions.h> | 49 | #include <linux/mtd/partitions.h> |
50 | 50 | ||
51 | #include <asm/plat-s3c24xx/clock.h> | 51 | #include <asm/plat-s3c24xx/clock.h> |
52 | #include <asm/plat-s3c24xx/devs.h> | 52 | #include <plat/devs.h> |
53 | #include <asm/plat-s3c24xx/cpu.h> | 53 | #include <plat/cpu.h> |
54 | #include <asm/plat-s3c24xx/pm.h> | 54 | #include <plat/pm.h> |
55 | #include <asm/plat-s3c24xx/udc.h> | 55 | #include <asm/plat-s3c24xx/udc.h> |
56 | 56 | ||
57 | static struct map_desc jive_iodesc[] __initdata = { | 57 | static struct map_desc jive_iodesc[] __initdata = { |
diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index 80affb1ee4cd..ae8dea1dbd83 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
33 | 33 | ||
34 | //#include <asm/debug-ll.h> | 34 | //#include <asm/debug-ll.h> |
35 | #include <asm/plat-s3c/regs-serial.h> | 35 | #include <plat/regs-serial.h> |
36 | #include <mach/regs-gpio.h> | 36 | #include <mach/regs-gpio.h> |
37 | #include <mach/regs-lcd.h> | 37 | #include <mach/regs-lcd.h> |
38 | 38 | ||
@@ -40,11 +40,11 @@ | |||
40 | #include <asm/plat-s3c24xx/udc.h> | 40 | #include <asm/plat-s3c24xx/udc.h> |
41 | #include <mach/fb.h> | 41 | #include <mach/fb.h> |
42 | 42 | ||
43 | #include <asm/plat-s3c24xx/s3c2410.h> | 43 | #include <plat/s3c2410.h> |
44 | #include <asm/plat-s3c24xx/s3c2412.h> | 44 | #include <asm/plat-s3c24xx/s3c2412.h> |
45 | #include <asm/plat-s3c24xx/clock.h> | 45 | #include <asm/plat-s3c24xx/clock.h> |
46 | #include <asm/plat-s3c24xx/devs.h> | 46 | #include <plat/devs.h> |
47 | #include <asm/plat-s3c24xx/cpu.h> | 47 | #include <plat/cpu.h> |
48 | 48 | ||
49 | #include <asm/plat-s3c24xx/common-smdk.h> | 49 | #include <asm/plat-s3c24xx/common-smdk.h> |
50 | 50 | ||
diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c index 7a08b3789915..4e84d404bf26 100644 --- a/arch/arm/mach-s3c2412/mach-vstms.c +++ b/arch/arm/mach-s3c2412/mach-vstms.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
34 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
35 | 35 | ||
36 | #include <asm/plat-s3c/regs-serial.h> | 36 | #include <plat/regs-serial.h> |
37 | #include <mach/regs-gpio.h> | 37 | #include <mach/regs-gpio.h> |
38 | #include <mach/regs-lcd.h> | 38 | #include <mach/regs-lcd.h> |
39 | 39 | ||
@@ -42,11 +42,11 @@ | |||
42 | 42 | ||
43 | #include <asm/plat-s3c/nand.h> | 43 | #include <asm/plat-s3c/nand.h> |
44 | 44 | ||
45 | #include <asm/plat-s3c24xx/s3c2410.h> | 45 | #include <plat/s3c2410.h> |
46 | #include <asm/plat-s3c24xx/s3c2412.h> | 46 | #include <asm/plat-s3c24xx/s3c2412.h> |
47 | #include <asm/plat-s3c24xx/clock.h> | 47 | #include <asm/plat-s3c24xx/clock.h> |
48 | #include <asm/plat-s3c24xx/devs.h> | 48 | #include <plat/devs.h> |
49 | #include <asm/plat-s3c24xx/cpu.h> | 49 | #include <plat/cpu.h> |
50 | 50 | ||
51 | 51 | ||
52 | static struct map_desc vstms_iodesc[] __initdata = { | 52 | static struct map_desc vstms_iodesc[] __initdata = { |
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c index 737523a4e037..3e5575f66863 100644 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c | |||
@@ -28,8 +28,8 @@ | |||
28 | #include <mach/regs-gpio.h> | 28 | #include <mach/regs-gpio.h> |
29 | #include <mach/regs-dsc.h> | 29 | #include <mach/regs-dsc.h> |
30 | 30 | ||
31 | #include <asm/plat-s3c24xx/cpu.h> | 31 | #include <plat/cpu.h> |
32 | #include <asm/plat-s3c24xx/pm.h> | 32 | #include <plat/pm.h> |
33 | 33 | ||
34 | #include <asm/plat-s3c24xx/s3c2412.h> | 34 | #include <asm/plat-s3c24xx/s3c2412.h> |
35 | 35 | ||
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c index d278010b9f60..4262de06f920 100644 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <mach/idle.h> | 34 | #include <mach/idle.h> |
35 | 35 | ||
36 | #include <mach/regs-clock.h> | 36 | #include <mach/regs-clock.h> |
37 | #include <asm/plat-s3c/regs-serial.h> | 37 | #include <plat/regs-serial.h> |
38 | #include <mach/regs-power.h> | 38 | #include <mach/regs-power.h> |
39 | #include <mach/regs-gpio.h> | 39 | #include <mach/regs-gpio.h> |
40 | #include <mach/regs-gpioj.h> | 40 | #include <mach/regs-gpioj.h> |
@@ -43,10 +43,10 @@ | |||
43 | #include <mach/regs-s3c2412.h> | 43 | #include <mach/regs-s3c2412.h> |
44 | 44 | ||
45 | #include <asm/plat-s3c24xx/s3c2412.h> | 45 | #include <asm/plat-s3c24xx/s3c2412.h> |
46 | #include <asm/plat-s3c24xx/cpu.h> | 46 | #include <plat/cpu.h> |
47 | #include <asm/plat-s3c24xx/devs.h> | 47 | #include <plat/devs.h> |
48 | #include <asm/plat-s3c24xx/clock.h> | 48 | #include <asm/plat-s3c24xx/clock.h> |
49 | #include <asm/plat-s3c24xx/pm.h> | 49 | #include <plat/pm.h> |
50 | 50 | ||
51 | #ifndef CONFIG_CPU_S3C2412_ONLY | 51 | #ifndef CONFIG_CPU_S3C2412_ONLY |
52 | void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO; | 52 | void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO; |