diff options
46 files changed, 47 insertions, 47 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index f0172d2c33bb..c9ac206f349b 100644 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <mach/regs-gpio.h> | 42 | #include <mach/regs-gpio.h> |
43 | 43 | ||
44 | #include <plat/s3c2410.h> | 44 | #include <plat/s3c2410.h> |
45 | #include <asm/plat-s3c24xx/clock.h> | 45 | #include <plat/clock.h> |
46 | #include <plat/cpu.h> | 46 | #include <plat/cpu.h> |
47 | 47 | ||
48 | int s3c2410_clkcon_enable(struct clk *clk, int enable) | 48 | int s3c2410_clkcon_enable(struct clk *clk, int enable) |
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index 99b6d68b754c..7d914a470b6c 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
22 | 22 | ||
23 | #include <plat/cpu.h> | 23 | #include <plat/cpu.h> |
24 | #include <asm/plat-s3c24xx/dma.h> | 24 | #include <plat/dma.h> |
25 | 25 | ||
26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
27 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
diff --git a/arch/arm/mach-s3c2410/include/mach/map.h b/arch/arm/mach-s3c2410/include/mach/map.h index 64bf7e94a5bf..23c470c2e5b1 100644 --- a/arch/arm/mach-s3c2410/include/mach/map.h +++ b/arch/arm/mach-s3c2410/include/mach/map.h | |||
@@ -13,7 +13,7 @@ | |||
13 | #ifndef __ASM_ARCH_MAP_H | 13 | #ifndef __ASM_ARCH_MAP_H |
14 | #define __ASM_ARCH_MAP_H | 14 | #define __ASM_ARCH_MAP_H |
15 | 15 | ||
16 | #include <asm/plat-s3c/map.h> | 16 | #include <plat/map.h> |
17 | 17 | ||
18 | #define S3C2410_ADDR(x) S3C_ADDR(x) | 18 | #define S3C2410_ADDR(x) S3C_ADDR(x) |
19 | 19 | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/uncompress.h b/arch/arm/mach-s3c2410/include/mach/uncompress.h index 708e47459ffc..ab39491beee2 100644 --- a/arch/arm/mach-s3c2410/include/mach/uncompress.h +++ b/arch/arm/mach-s3c2410/include/mach/uncompress.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #undef S3C2410_GPIOREG | 21 | #undef S3C2410_GPIOREG |
22 | #define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x))) | 22 | #define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x))) |
23 | 23 | ||
24 | #include <asm/plat-s3c/uncompress.h> | 24 | #include <plat/uncompress.h> |
25 | 25 | ||
26 | static inline int is_arm926(void) | 26 | static inline int is_arm926(void) |
27 | { | 27 | { |
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index a01e3d3b0dff..599c0c227b96 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -55,7 +55,7 @@ | |||
55 | 55 | ||
56 | #include <linux/serial_8250.h> | 56 | #include <linux/serial_8250.h> |
57 | 57 | ||
58 | #include <asm/plat-s3c24xx/clock.h> | 58 | #include <plat/clock.h> |
59 | #include <plat/devs.h> | 59 | #include <plat/devs.h> |
60 | #include <plat/cpu.h> | 60 | #include <plat/cpu.h> |
61 | 61 | ||
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index f9538d1965f3..21b365739430 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <mach/fb.h> | 40 | #include <mach/fb.h> |
41 | #include <asm/plat-s3c24xx/udc.h> | 41 | #include <asm/plat-s3c24xx/udc.h> |
42 | 42 | ||
43 | #include <asm/plat-s3c24xx/clock.h> | 43 | #include <plat/clock.h> |
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | #include <plat/pm.h> | 46 | #include <plat/pm.h> |
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index f9cc338a9c4c..b0534ad5bc11 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <asm/plat-s3c/iic.h> | 43 | #include <asm/plat-s3c/iic.h> |
44 | #include <plat/regs-serial.h> | 44 | #include <plat/regs-serial.h> |
45 | 45 | ||
46 | #include <asm/plat-s3c24xx/clock.h> | 46 | #include <plat/clock.h> |
47 | #include <plat/cpu.h> | 47 | #include <plat/cpu.h> |
48 | #include <plat/devs.h> | 48 | #include <plat/devs.h> |
49 | #include <plat/s3c2410.h> | 49 | #include <plat/s3c2410.h> |
diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c index d49dbb0a4c8d..3a32e1636aa4 100644 --- a/arch/arm/mach-s3c2410/mach-otom.c +++ b/arch/arm/mach-s3c2410/mach-otom.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <mach/regs-gpio.h> | 33 | #include <mach/regs-gpio.h> |
34 | 34 | ||
35 | #include <plat/s3c2410.h> | 35 | #include <plat/s3c2410.h> |
36 | #include <asm/plat-s3c24xx/clock.h> | 36 | #include <plat/clock.h> |
37 | #include <plat/devs.h> | 37 | #include <plat/devs.h> |
38 | #include <plat/cpu.h> | 38 | #include <plat/cpu.h> |
39 | 39 | ||
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c index c3277258ecaf..53ad949ef6c2 100644 --- a/arch/arm/mach-s3c2410/mach-qt2410.c +++ b/arch/arm/mach-s3c2410/mach-qt2410.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #include <mach/spi.h> | 56 | #include <mach/spi.h> |
57 | #include <mach/spi-gpio.h> | 57 | #include <mach/spi-gpio.h> |
58 | 58 | ||
59 | #include <asm/plat-s3c24xx/common-smdk.h> | 59 | #include <plat/common-smdk.h> |
60 | #include <plat/devs.h> | 60 | #include <plat/devs.h> |
61 | #include <plat/cpu.h> | 61 | #include <plat/cpu.h> |
62 | #include <plat/pm.h> | 62 | #include <plat/pm.h> |
diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c index 6d940640a74f..406cba871c65 100644 --- a/arch/arm/mach-s3c2410/mach-smdk2410.c +++ b/arch/arm/mach-s3c2410/mach-smdk2410.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #include <plat/devs.h> | 51 | #include <plat/devs.h> |
52 | #include <plat/cpu.h> | 52 | #include <plat/cpu.h> |
53 | 53 | ||
54 | #include <asm/plat-s3c24xx/common-smdk.h> | 54 | #include <plat/common-smdk.h> |
55 | 55 | ||
56 | static struct map_desc smdk2410_iodesc[] __initdata = { | 56 | static struct map_desc smdk2410_iodesc[] __initdata = { |
57 | /* nothing here yet */ | 57 | /* nothing here yet */ |
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 41a2a0ee3557..99c82079335e 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <mach/regs-gpio.h> | 44 | #include <mach/regs-gpio.h> |
45 | #include <mach/leds-gpio.h> | 45 | #include <mach/leds-gpio.h> |
46 | 46 | ||
47 | #include <asm/plat-s3c24xx/clock.h> | 47 | #include <plat/clock.h> |
48 | #include <plat/devs.h> | 48 | #include <plat/devs.h> |
49 | #include <plat/cpu.h> | 49 | #include <plat/cpu.h> |
50 | 50 | ||
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c index 97173d360594..e84c166a6f6e 100644 --- a/arch/arm/mach-s3c2410/s3c2410.c +++ b/arch/arm/mach-s3c2410/s3c2410.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <plat/s3c2410.h> | 34 | #include <plat/s3c2410.h> |
35 | #include <plat/cpu.h> | 35 | #include <plat/cpu.h> |
36 | #include <plat/devs.h> | 36 | #include <plat/devs.h> |
37 | #include <asm/plat-s3c24xx/clock.h> | 37 | #include <plat/clock.h> |
38 | 38 | ||
39 | /* Initial IO mappings */ | 39 | /* Initial IO mappings */ |
40 | 40 | ||
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c index 8b3382d24799..8be4cd677385 100644 --- a/arch/arm/mach-s3c2412/clock.c +++ b/arch/arm/mach-s3c2412/clock.c | |||
@@ -41,8 +41,8 @@ | |||
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 <plat/s3c2412.h> |
45 | #include <asm/plat-s3c24xx/clock.h> | 45 | #include <plat/clock.h> |
46 | #include <plat/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 |
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index d4af572f22fd..6038e9f30ad8 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | 23 | ||
24 | #include <asm/plat-s3c24xx/dma.h> | 24 | #include <plat/dma.h> |
25 | #include <plat/cpu.h> | 25 | #include <plat/cpu.h> |
26 | 26 | ||
27 | #include <plat/regs-serial.h> | 27 | #include <plat/regs-serial.h> |
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index 246c6dbcd87c..b08f18c8c47a 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #include <linux/mtd/nand_ecc.h> | 48 | #include <linux/mtd/nand_ecc.h> |
49 | #include <linux/mtd/partitions.h> | 49 | #include <linux/mtd/partitions.h> |
50 | 50 | ||
51 | #include <asm/plat-s3c24xx/clock.h> | 51 | #include <plat/clock.h> |
52 | #include <plat/devs.h> | 52 | #include <plat/devs.h> |
53 | #include <plat/cpu.h> | 53 | #include <plat/cpu.h> |
54 | #include <plat/pm.h> | 54 | #include <plat/pm.h> |
diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index ae8dea1dbd83..cd20dbbf9c27 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c | |||
@@ -41,12 +41,12 @@ | |||
41 | #include <mach/fb.h> | 41 | #include <mach/fb.h> |
42 | 42 | ||
43 | #include <plat/s3c2410.h> | 43 | #include <plat/s3c2410.h> |
44 | #include <asm/plat-s3c24xx/s3c2412.h> | 44 | #include <plat/s3c2412.h> |
45 | #include <asm/plat-s3c24xx/clock.h> | 45 | #include <plat/clock.h> |
46 | #include <plat/devs.h> | 46 | #include <plat/devs.h> |
47 | #include <plat/cpu.h> | 47 | #include <plat/cpu.h> |
48 | 48 | ||
49 | #include <asm/plat-s3c24xx/common-smdk.h> | 49 | #include <plat/common-smdk.h> |
50 | 50 | ||
51 | static struct map_desc smdk2413_iodesc[] __initdata = { | 51 | static struct map_desc smdk2413_iodesc[] __initdata = { |
52 | }; | 52 | }; |
diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c index 4e84d404bf26..70463ccdb5fe 100644 --- a/arch/arm/mach-s3c2412/mach-vstms.c +++ b/arch/arm/mach-s3c2412/mach-vstms.c | |||
@@ -43,8 +43,8 @@ | |||
43 | #include <asm/plat-s3c/nand.h> | 43 | #include <asm/plat-s3c/nand.h> |
44 | 44 | ||
45 | #include <plat/s3c2410.h> | 45 | #include <plat/s3c2410.h> |
46 | #include <asm/plat-s3c24xx/s3c2412.h> | 46 | #include <plat/s3c2412.h> |
47 | #include <asm/plat-s3c24xx/clock.h> | 47 | #include <plat/clock.h> |
48 | #include <plat/devs.h> | 48 | #include <plat/devs.h> |
49 | #include <plat/cpu.h> | 49 | #include <plat/cpu.h> |
50 | 50 | ||
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c index 3e5575f66863..4c988a44d286 100644 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <plat/cpu.h> | 31 | #include <plat/cpu.h> |
32 | #include <plat/pm.h> | 32 | #include <plat/pm.h> |
33 | 33 | ||
34 | #include <asm/plat-s3c24xx/s3c2412.h> | 34 | #include <plat/s3c2412.h> |
35 | 35 | ||
36 | extern void s3c2412_sleep_enter(void); | 36 | extern void s3c2412_sleep_enter(void); |
37 | 37 | ||
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c index 4262de06f920..4f18dfc04226 100644 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.c | |||
@@ -42,10 +42,10 @@ | |||
42 | #include <asm/plat-s3c24xx/regs-spi.h> | 42 | #include <asm/plat-s3c24xx/regs-spi.h> |
43 | #include <mach/regs-s3c2412.h> | 43 | #include <mach/regs-s3c2412.h> |
44 | 44 | ||
45 | #include <asm/plat-s3c24xx/s3c2412.h> | 45 | #include <plat/s3c2412.h> |
46 | #include <plat/cpu.h> | 46 | #include <plat/cpu.h> |
47 | #include <plat/devs.h> | 47 | #include <plat/devs.h> |
48 | #include <asm/plat-s3c24xx/clock.h> | 48 | #include <plat/clock.h> |
49 | #include <plat/pm.h> | 49 | #include <plat/pm.h> |
50 | 50 | ||
51 | #ifndef CONFIG_CPU_S3C2412_ONLY | 51 | #ifndef CONFIG_CPU_S3C2412_ONLY |
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c index bb1101f6a896..70aba1e9f7da 100644 --- a/arch/arm/mach-s3c2440/clock.c +++ b/arch/arm/mach-s3c2440/clock.c | |||
@@ -41,7 +41,7 @@ | |||
41 | 41 | ||
42 | #include <mach/regs-clock.h> | 42 | #include <mach/regs-clock.h> |
43 | 43 | ||
44 | #include <asm/plat-s3c24xx/clock.h> | 44 | #include <plat/clock.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | 46 | ||
47 | /* S3C2440 extended clock support */ | 47 | /* S3C2440 extended clock support */ |
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index b674f869e57c..32303f6a8321 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/dma.h> | 20 | #include <asm/dma.h> |
21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
22 | 22 | ||
23 | #include <asm/plat-s3c24xx/dma.h> | 23 | #include <plat/dma.h> |
24 | #include <plat/cpu.h> | 24 | #include <plat/cpu.h> |
25 | 25 | ||
26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index a37f8b220572..1309fbe58543 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | #include <net/ax88796.h> | 50 | #include <net/ax88796.h> |
51 | 51 | ||
52 | #include <asm/plat-s3c24xx/clock.h> | 52 | #include <plat/clock.h> |
53 | #include <plat/devs.h> | 53 | #include <plat/devs.h> |
54 | #include <plat/cpu.h> | 54 | #include <plat/cpu.h> |
55 | 55 | ||
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index 5114b87d8cfd..66876c6f2f1c 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <linux/mtd/nand_ecc.h> | 42 | #include <linux/mtd/nand_ecc.h> |
43 | #include <linux/mtd/partitions.h> | 43 | #include <linux/mtd/partitions.h> |
44 | 44 | ||
45 | #include <asm/plat-s3c24xx/clock.h> | 45 | #include <plat/clock.h> |
46 | #include <plat/devs.h> | 46 | #include <plat/devs.h> |
47 | #include <plat/cpu.h> | 47 | #include <plat/cpu.h> |
48 | 48 | ||
diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c index 9d8259589856..76b8991dc23d 100644 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #include <plat/s3c2410.h> | 41 | #include <plat/s3c2410.h> |
42 | #include <plat/s3c2440.h> | 42 | #include <plat/s3c2440.h> |
43 | #include <asm/plat-s3c24xx/clock.h> | 43 | #include <plat/clock.h> |
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | 46 | ||
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 5b1c32e64f0b..6de08f935a84 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <linux/mtd/nand_ecc.h> | 44 | #include <linux/mtd/nand_ecc.h> |
45 | #include <linux/mtd/partitions.h> | 45 | #include <linux/mtd/partitions.h> |
46 | 46 | ||
47 | #include <asm/plat-s3c24xx/clock.h> | 47 | #include <plat/clock.h> |
48 | #include <plat/devs.h> | 48 | #include <plat/devs.h> |
49 | #include <plat/cpu.h> | 49 | #include <plat/cpu.h> |
50 | 50 | ||
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 46128a170fed..1c91c586f64b 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include <asm/plat-s3c/nand.h> | 46 | #include <asm/plat-s3c/nand.h> |
47 | #include <mach/fb.h> | 47 | #include <mach/fb.h> |
48 | 48 | ||
49 | #include <asm/plat-s3c24xx/clock.h> | 49 | #include <plat/clock.h> |
50 | #include <plat/devs.h> | 50 | #include <plat/devs.h> |
51 | #include <plat/cpu.h> | 51 | #include <plat/cpu.h> |
52 | #include <plat/pm.h> | 52 | #include <plat/pm.h> |
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c index e1799abec87d..2bd14a3778d4 100644 --- a/arch/arm/mach-s3c2440/mach-smdk2440.c +++ b/arch/arm/mach-s3c2440/mach-smdk2440.c | |||
@@ -40,11 +40,11 @@ | |||
40 | 40 | ||
41 | #include <plat/s3c2410.h> | 41 | #include <plat/s3c2410.h> |
42 | #include <plat/s3c2440.h> | 42 | #include <plat/s3c2440.h> |
43 | #include <asm/plat-s3c24xx/clock.h> | 43 | #include <plat/clock.h> |
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | 46 | ||
47 | #include <asm/plat-s3c24xx/common-smdk.h> | 47 | #include <plat/common-smdk.h> |
48 | 48 | ||
49 | static struct map_desc smdk2440_iodesc[] __initdata = { | 49 | static struct map_desc smdk2440_iodesc[] __initdata = { |
50 | /* ISA IO Space map (memory space selected by A24) */ | 50 | /* ISA IO Space map (memory space selected by A24) */ |
diff --git a/arch/arm/mach-s3c2442/clock.c b/arch/arm/mach-s3c2442/clock.c index 075db289b7f3..6bd81790c167 100644 --- a/arch/arm/mach-s3c2442/clock.c +++ b/arch/arm/mach-s3c2442/clock.c | |||
@@ -41,7 +41,7 @@ | |||
41 | 41 | ||
42 | #include <mach/regs-clock.h> | 42 | #include <mach/regs-clock.h> |
43 | 43 | ||
44 | #include <asm/plat-s3c24xx/clock.h> | 44 | #include <plat/clock.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | 46 | ||
47 | /* S3C2442 extended clock support */ | 47 | /* S3C2442 extended clock support */ |
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index ce56b51170f7..0e849063de75 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <mach/regs-s3c2443-clock.h> | 40 | #include <mach/regs-s3c2443-clock.h> |
41 | 41 | ||
42 | #include <plat/s3c2443.h> | 42 | #include <plat/s3c2443.h> |
43 | #include <asm/plat-s3c24xx/clock.h> | 43 | #include <plat/clock.h> |
44 | #include <plat/cpu.h> | 44 | #include <plat/cpu.h> |
45 | 45 | ||
46 | /* We currently have to assume that the system is running | 46 | /* We currently have to assume that the system is running |
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c index e75b6e3cfc34..438a01960882 100644 --- a/arch/arm/mach-s3c2443/dma.c +++ b/arch/arm/mach-s3c2443/dma.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | 23 | ||
24 | #include <asm/plat-s3c24xx/dma.h> | 24 | #include <plat/dma.h> |
25 | #include <plat/cpu.h> | 25 | #include <plat/cpu.h> |
26 | 26 | ||
27 | #include <plat/regs-serial.h> | 27 | #include <plat/regs-serial.h> |
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c index b1d5637d6dc1..4ea77bfb8b0a 100644 --- a/arch/arm/mach-s3c2443/mach-smdk2443.c +++ b/arch/arm/mach-s3c2443/mach-smdk2443.c | |||
@@ -40,11 +40,11 @@ | |||
40 | 40 | ||
41 | #include <plat/s3c2410.h> | 41 | #include <plat/s3c2410.h> |
42 | #include <plat/s3c2440.h> | 42 | #include <plat/s3c2440.h> |
43 | #include <asm/plat-s3c24xx/clock.h> | 43 | #include <plat/clock.h> |
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | 46 | ||
47 | #include <asm/plat-s3c24xx/common-smdk.h> | 47 | #include <plat/common-smdk.h> |
48 | 48 | ||
49 | static struct map_desc smdk2443_iodesc[] __initdata = { | 49 | static struct map_desc smdk2443_iodesc[] __initdata = { |
50 | /* ISA IO Space map (memory space selected by A24) */ | 50 | /* ISA IO Space map (memory space selected by A24) */ |
diff --git a/include/asm-arm/plat-s3c/map.h b/arch/arm/plat-s3c/include/plat/map.h index b84289d32a54..b84289d32a54 100644 --- a/include/asm-arm/plat-s3c/map.h +++ b/arch/arm/plat-s3c/include/plat/map.h | |||
diff --git a/include/asm-arm/plat-s3c/regs-adc.h b/arch/arm/plat-s3c/include/plat/regs-adc.h index 4323cccc86cd..4323cccc86cd 100644 --- a/include/asm-arm/plat-s3c/regs-adc.h +++ b/arch/arm/plat-s3c/include/plat/regs-adc.h | |||
diff --git a/include/asm-arm/plat-s3c/uncompress.h b/arch/arm/plat-s3c/include/plat/uncompress.h index 4df006b9cc10..4df006b9cc10 100644 --- a/include/asm-arm/plat-s3c/uncompress.h +++ b/arch/arm/plat-s3c/include/plat/uncompress.h | |||
diff --git a/arch/arm/plat-s3c24xx/clock.c b/arch/arm/plat-s3c24xx/clock.c index 80fb82f2616d..f333b64512b3 100644 --- a/arch/arm/plat-s3c24xx/clock.c +++ b/arch/arm/plat-s3c24xx/clock.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <mach/regs-clock.h> | 47 | #include <mach/regs-clock.h> |
48 | #include <mach/regs-gpio.h> | 48 | #include <mach/regs-gpio.h> |
49 | 49 | ||
50 | #include <asm/plat-s3c24xx/clock.h> | 50 | #include <plat/clock.h> |
51 | #include <plat/cpu.h> | 51 | #include <plat/cpu.h> |
52 | 52 | ||
53 | /* clock information */ | 53 | /* clock information */ |
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index 32490fa97b40..ebdf6cd832a4 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #include <asm/plat-s3c/nand.h> | 41 | #include <asm/plat-s3c/nand.h> |
42 | 42 | ||
43 | #include <asm/plat-s3c24xx/common-smdk.h> | 43 | #include <plat/common-smdk.h> |
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/pm.h> | 45 | #include <plat/pm.h> |
46 | 46 | ||
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index abddadd69119..51aea671075f 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c | |||
@@ -46,10 +46,10 @@ | |||
46 | 46 | ||
47 | #include <plat/cpu.h> | 47 | #include <plat/cpu.h> |
48 | #include <plat/devs.h> | 48 | #include <plat/devs.h> |
49 | #include <asm/plat-s3c24xx/clock.h> | 49 | #include <plat/clock.h> |
50 | #include <plat/s3c2400.h> | 50 | #include <plat/s3c2400.h> |
51 | #include <plat/s3c2410.h> | 51 | #include <plat/s3c2410.h> |
52 | #include <asm/plat-s3c24xx/s3c2412.h> | 52 | #include <plat/s3c2412.h> |
53 | #include "s3c244x.h" | 53 | #include "s3c244x.h" |
54 | #include <plat/s3c2440.h> | 54 | #include <plat/s3c2440.h> |
55 | #include <plat/s3c2442.h> | 55 | #include <plat/s3c2442.h> |
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index 08c2aaf14c41..390ff9f478bf 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <asm/mach/dma.h> | 36 | #include <asm/mach/dma.h> |
37 | #include <mach/map.h> | 37 | #include <mach/map.h> |
38 | 38 | ||
39 | #include <asm/plat-s3c24xx/dma.h> | 39 | #include <plat/dma.h> |
40 | 40 | ||
41 | /* io map for dma */ | 41 | /* io map for dma */ |
42 | static void __iomem *dma_base; | 42 | static void __iomem *dma_base; |
diff --git a/include/asm-arm/plat-s3c24xx/clock.h b/arch/arm/plat-s3c24xx/include/plat/clock.h index 235b753cd877..235b753cd877 100644 --- a/include/asm-arm/plat-s3c24xx/clock.h +++ b/arch/arm/plat-s3c24xx/include/plat/clock.h | |||
diff --git a/include/asm-arm/plat-s3c24xx/common-smdk.h b/arch/arm/plat-s3c24xx/include/plat/common-smdk.h index 58d9094c935c..58d9094c935c 100644 --- a/include/asm-arm/plat-s3c24xx/common-smdk.h +++ b/arch/arm/plat-s3c24xx/include/plat/common-smdk.h | |||
diff --git a/include/asm-arm/plat-s3c24xx/dma.h b/arch/arm/plat-s3c24xx/include/plat/dma.h index c78efe316fc8..c78efe316fc8 100644 --- a/include/asm-arm/plat-s3c24xx/dma.h +++ b/arch/arm/plat-s3c24xx/include/plat/dma.h | |||
diff --git a/include/asm-arm/plat-s3c24xx/s3c2412.h b/arch/arm/plat-s3c24xx/include/plat/s3c2412.h index 3ec97685e781..3ec97685e781 100644 --- a/include/asm-arm/plat-s3c24xx/s3c2412.h +++ b/arch/arm/plat-s3c24xx/include/plat/s3c2412.h | |||
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c index 245270b7d5b7..b8e854f1b1d5 100644 --- a/arch/arm/plat-s3c24xx/pwm-clock.c +++ b/arch/arm/plat-s3c24xx/pwm-clock.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <mach/regs-clock.h> | 24 | #include <mach/regs-clock.h> |
25 | #include <mach/regs-gpio.h> | 25 | #include <mach/regs-gpio.h> |
26 | 26 | ||
27 | #include <asm/plat-s3c24xx/clock.h> | 27 | #include <plat/clock.h> |
28 | #include <plat/cpu.h> | 28 | #include <plat/cpu.h> |
29 | 29 | ||
30 | #include <plat/regs-timer.h> | 30 | #include <plat/regs-timer.h> |
diff --git a/arch/arm/plat-s3c24xx/s3c244x-clock.c b/arch/arm/plat-s3c24xx/s3c244x-clock.c index 2a8d7ca428b5..b998ee624471 100644 --- a/arch/arm/plat-s3c24xx/s3c244x-clock.c +++ b/arch/arm/plat-s3c24xx/s3c244x-clock.c | |||
@@ -41,7 +41,7 @@ | |||
41 | 41 | ||
42 | #include <mach/regs-clock.h> | 42 | #include <mach/regs-clock.h> |
43 | 43 | ||
44 | #include <asm/plat-s3c24xx/clock.h> | 44 | #include <plat/clock.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | 46 | ||
47 | static int s3c2440_setparent_armclk(struct clk *clk, struct clk *parent) | 47 | static int s3c2440_setparent_armclk(struct clk *clk, struct clk *parent) |
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index 793e0cae2c77..e94721fad411 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <plat/s3c2410.h> | 38 | #include <plat/s3c2410.h> |
39 | #include <plat/s3c2440.h> | 39 | #include <plat/s3c2440.h> |
40 | #include "s3c244x.h" | 40 | #include "s3c244x.h" |
41 | #include <asm/plat-s3c24xx/clock.h> | 41 | #include <plat/clock.h> |
42 | #include <plat/devs.h> | 42 | #include <plat/devs.h> |
43 | #include <plat/cpu.h> | 43 | #include <plat/cpu.h> |
44 | #include <plat/pm.h> | 44 | #include <plat/pm.h> |
diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c index 71c65c93dab0..0bba4bf25a95 100644 --- a/arch/arm/plat-s3c24xx/time.c +++ b/arch/arm/plat-s3c24xx/time.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <mach/regs-irq.h> | 37 | #include <mach/regs-irq.h> |
38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
39 | 39 | ||
40 | #include <asm/plat-s3c24xx/clock.h> | 40 | #include <plat/clock.h> |
41 | #include <plat/cpu.h> | 41 | #include <plat/cpu.h> |
42 | 42 | ||
43 | static unsigned long timer_startval; | 43 | static unsigned long timer_startval; |