Selaa lähdekoodia

[ARM] S3C24XX: Additional include moves

Continue moving the include files into arch/arm

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks 16 vuotta sitten
vanhempi
commit
d5120ae72a
46 muutettua tiedostoa jossa 47 lisäystä ja 47 poistoa
  1. 1 1
      arch/arm/mach-s3c2410/clock.c
  2. 1 1
      arch/arm/mach-s3c2410/dma.c
  3. 1 1
      arch/arm/mach-s3c2410/include/mach/map.h
  4. 1 1
      arch/arm/mach-s3c2410/include/mach/uncompress.h
  5. 1 1
      arch/arm/mach-s3c2410/mach-bast.c
  6. 1 1
      arch/arm/mach-s3c2410/mach-h1940.c
  7. 1 1
      arch/arm/mach-s3c2410/mach-n30.c
  8. 1 1
      arch/arm/mach-s3c2410/mach-otom.c
  9. 1 1
      arch/arm/mach-s3c2410/mach-qt2410.c
  10. 1 1
      arch/arm/mach-s3c2410/mach-smdk2410.c
  11. 1 1
      arch/arm/mach-s3c2410/mach-vr1000.c
  12. 1 1
      arch/arm/mach-s3c2410/s3c2410.c
  13. 2 2
      arch/arm/mach-s3c2412/clock.c
  14. 1 1
      arch/arm/mach-s3c2412/dma.c
  15. 1 1
      arch/arm/mach-s3c2412/mach-jive.c
  16. 3 3
      arch/arm/mach-s3c2412/mach-smdk2413.c
  17. 2 2
      arch/arm/mach-s3c2412/mach-vstms.c
  18. 1 1
      arch/arm/mach-s3c2412/pm.c
  19. 2 2
      arch/arm/mach-s3c2412/s3c2412.c
  20. 1 1
      arch/arm/mach-s3c2440/clock.c
  21. 1 1
      arch/arm/mach-s3c2440/dma.c
  22. 1 1
      arch/arm/mach-s3c2440/mach-anubis.c
  23. 1 1
      arch/arm/mach-s3c2440/mach-at2440evb.c
  24. 1 1
      arch/arm/mach-s3c2440/mach-nexcoder.c
  25. 1 1
      arch/arm/mach-s3c2440/mach-osiris.c
  26. 1 1
      arch/arm/mach-s3c2440/mach-rx3715.c
  27. 2 2
      arch/arm/mach-s3c2440/mach-smdk2440.c
  28. 1 1
      arch/arm/mach-s3c2442/clock.c
  29. 1 1
      arch/arm/mach-s3c2443/clock.c
  30. 1 1
      arch/arm/mach-s3c2443/dma.c
  31. 2 2
      arch/arm/mach-s3c2443/mach-smdk2443.c
  32. 0 0
      arch/arm/plat-s3c/include/plat/map.h
  33. 0 0
      arch/arm/plat-s3c/include/plat/regs-adc.h
  34. 0 0
      arch/arm/plat-s3c/include/plat/uncompress.h
  35. 1 1
      arch/arm/plat-s3c24xx/clock.c
  36. 1 1
      arch/arm/plat-s3c24xx/common-smdk.c
  37. 2 2
      arch/arm/plat-s3c24xx/cpu.c
  38. 1 1
      arch/arm/plat-s3c24xx/dma.c
  39. 0 0
      arch/arm/plat-s3c24xx/include/plat/clock.h
  40. 0 0
      arch/arm/plat-s3c24xx/include/plat/common-smdk.h
  41. 0 0
      arch/arm/plat-s3c24xx/include/plat/dma.h
  42. 0 0
      arch/arm/plat-s3c24xx/include/plat/s3c2412.h
  43. 1 1
      arch/arm/plat-s3c24xx/pwm-clock.c
  44. 1 1
      arch/arm/plat-s3c24xx/s3c244x-clock.c
  45. 1 1
      arch/arm/plat-s3c24xx/s3c244x.c
  46. 1 1
      arch/arm/plat-s3c24xx/time.c

+ 1 - 1
arch/arm/mach-s3c2410/clock.c

@@ -42,7 +42,7 @@
 #include <mach/regs-gpio.h>
 
 #include <plat/s3c2410.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 int s3c2410_clkcon_enable(struct clk *clk, int enable)

+ 1 - 1
arch/arm/mach-s3c2410/dma.c

@@ -21,7 +21,7 @@
 #include <mach/dma.h>
 
 #include <plat/cpu.h>
-#include <asm/plat-s3c24xx/dma.h>
+#include <plat/dma.h>
 
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>

+ 1 - 1
arch/arm/mach-s3c2410/include/mach/map.h

@@ -13,7 +13,7 @@
 #ifndef __ASM_ARCH_MAP_H
 #define __ASM_ARCH_MAP_H
 
-#include <asm/plat-s3c/map.h>
+#include <plat/map.h>
 
 #define S3C2410_ADDR(x)		S3C_ADDR(x)
 

+ 1 - 1
arch/arm/mach-s3c2410/include/mach/uncompress.h

@@ -21,7 +21,7 @@
 #undef S3C2410_GPIOREG
 #define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x)))
 
-#include <asm/plat-s3c/uncompress.h>
+#include <plat/uncompress.h>
 
 static inline int is_arm926(void)
 {

+ 1 - 1
arch/arm/mach-s3c2410/mach-bast.c

@@ -55,7 +55,7 @@
 
 #include <linux/serial_8250.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 

+ 1 - 1
arch/arm/mach-s3c2410/mach-h1940.c

@@ -40,7 +40,7 @@
 #include <mach/fb.h>
 #include <asm/plat-s3c24xx/udc.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>

+ 1 - 1
arch/arm/mach-s3c2410/mach-n30.c

@@ -43,7 +43,7 @@
 #include <asm/plat-s3c/iic.h>
 #include <plat/regs-serial.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/s3c2410.h>

+ 1 - 1
arch/arm/mach-s3c2410/mach-otom.c

@@ -33,7 +33,7 @@
 #include <mach/regs-gpio.h>
 
 #include <plat/s3c2410.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 

+ 1 - 1
arch/arm/mach-s3c2410/mach-qt2410.c

@@ -56,7 +56,7 @@
 #include <mach/spi.h>
 #include <mach/spi-gpio.h>
 
-#include <asm/plat-s3c24xx/common-smdk.h>
+#include <plat/common-smdk.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>

+ 1 - 1
arch/arm/mach-s3c2410/mach-smdk2410.c

@@ -51,7 +51,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 
-#include <asm/plat-s3c24xx/common-smdk.h>
+#include <plat/common-smdk.h>
 
 static struct map_desc smdk2410_iodesc[] __initdata = {
   /* nothing here yet */

+ 1 - 1
arch/arm/mach-s3c2410/mach-vr1000.c

@@ -44,7 +44,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/leds-gpio.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 

+ 1 - 1
arch/arm/mach-s3c2410/s3c2410.c

@@ -34,7 +34,7 @@
 #include <plat/s3c2410.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 
 /* Initial IO mappings */
 

+ 2 - 2
arch/arm/mach-s3c2412/clock.c

@@ -41,8 +41,8 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
-#include <asm/plat-s3c24xx/s3c2412.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/s3c2412.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 /* We currently have to assume that the system is running

+ 1 - 1
arch/arm/mach-s3c2412/dma.c

@@ -21,7 +21,7 @@
 #include <mach/dma.h>
 #include <asm/io.h>
 
-#include <asm/plat-s3c24xx/dma.h>
+#include <plat/dma.h>
 #include <plat/cpu.h>
 
 #include <plat/regs-serial.h>

+ 1 - 1
arch/arm/mach-s3c2412/mach-jive.c

@@ -48,7 +48,7 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>

+ 3 - 3
arch/arm/mach-s3c2412/mach-smdk2413.c

@@ -41,12 +41,12 @@
 #include <mach/fb.h>
 
 #include <plat/s3c2410.h>
-#include <asm/plat-s3c24xx/s3c2412.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/s3c2412.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 
-#include <asm/plat-s3c24xx/common-smdk.h>
+#include <plat/common-smdk.h>
 
 static struct map_desc smdk2413_iodesc[] __initdata = {
 };

+ 2 - 2
arch/arm/mach-s3c2412/mach-vstms.c

@@ -43,8 +43,8 @@
 #include <asm/plat-s3c/nand.h>
 
 #include <plat/s3c2410.h>
-#include <asm/plat-s3c24xx/s3c2412.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/s3c2412.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 

+ 1 - 1
arch/arm/mach-s3c2412/pm.c

@@ -31,7 +31,7 @@
 #include <plat/cpu.h>
 #include <plat/pm.h>
 
-#include <asm/plat-s3c24xx/s3c2412.h>
+#include <plat/s3c2412.h>
 
 extern void s3c2412_sleep_enter(void);
 

+ 2 - 2
arch/arm/mach-s3c2412/s3c2412.c

@@ -42,10 +42,10 @@
 #include <asm/plat-s3c24xx/regs-spi.h>
 #include <mach/regs-s3c2412.h>
 
-#include <asm/plat-s3c24xx/s3c2412.h>
+#include <plat/s3c2412.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/pm.h>
 
 #ifndef CONFIG_CPU_S3C2412_ONLY

+ 1 - 1
arch/arm/mach-s3c2440/clock.c

@@ -41,7 +41,7 @@
 
 #include <mach/regs-clock.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 /* S3C2440 extended clock support */

+ 1 - 1
arch/arm/mach-s3c2440/dma.c

@@ -20,7 +20,7 @@
 #include <asm/dma.h>
 #include <mach/dma.h>
 
-#include <asm/plat-s3c24xx/dma.h>
+#include <plat/dma.h>
 #include <plat/cpu.h>
 
 #include <plat/regs-serial.h>

+ 1 - 1
arch/arm/mach-s3c2440/mach-anubis.c

@@ -49,7 +49,7 @@
 
 #include <net/ax88796.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 

+ 1 - 1
arch/arm/mach-s3c2440/mach-at2440evb.c

@@ -42,7 +42,7 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 

+ 1 - 1
arch/arm/mach-s3c2440/mach-nexcoder.c

@@ -40,7 +40,7 @@
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2440.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 

+ 1 - 1
arch/arm/mach-s3c2440/mach-osiris.c

@@ -44,7 +44,7 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 

+ 1 - 1
arch/arm/mach-s3c2440/mach-rx3715.c

@@ -46,7 +46,7 @@
 #include <asm/plat-s3c/nand.h>
 #include <mach/fb.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>

+ 2 - 2
arch/arm/mach-s3c2440/mach-smdk2440.c

@@ -40,11 +40,11 @@
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2440.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 
-#include <asm/plat-s3c24xx/common-smdk.h>
+#include <plat/common-smdk.h>
 
 static struct map_desc smdk2440_iodesc[] __initdata = {
 	/* ISA IO Space map (memory space selected by A24) */

+ 1 - 1
arch/arm/mach-s3c2442/clock.c

@@ -41,7 +41,7 @@
 
 #include <mach/regs-clock.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 /* S3C2442 extended clock support */

+ 1 - 1
arch/arm/mach-s3c2443/clock.c

@@ -40,7 +40,7 @@
 #include <mach/regs-s3c2443-clock.h>
 
 #include <plat/s3c2443.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 /* We currently have to assume that the system is running

+ 1 - 1
arch/arm/mach-s3c2443/dma.c

@@ -21,7 +21,7 @@
 #include <mach/dma.h>
 #include <asm/io.h>
 
-#include <asm/plat-s3c24xx/dma.h>
+#include <plat/dma.h>
 #include <plat/cpu.h>
 
 #include <plat/regs-serial.h>

+ 2 - 2
arch/arm/mach-s3c2443/mach-smdk2443.c

@@ -40,11 +40,11 @@
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2440.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 
-#include <asm/plat-s3c24xx/common-smdk.h>
+#include <plat/common-smdk.h>
 
 static struct map_desc smdk2443_iodesc[] __initdata = {
 	/* ISA IO Space map (memory space selected by A24) */

+ 0 - 0
include/asm-arm/plat-s3c/map.h → arch/arm/plat-s3c/include/plat/map.h


+ 0 - 0
include/asm-arm/plat-s3c/regs-adc.h → arch/arm/plat-s3c/include/plat/regs-adc.h


+ 0 - 0
include/asm-arm/plat-s3c/uncompress.h → arch/arm/plat-s3c/include/plat/uncompress.h


+ 1 - 1
arch/arm/plat-s3c24xx/clock.c

@@ -47,7 +47,7 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 /* clock information */

+ 1 - 1
arch/arm/plat-s3c24xx/common-smdk.c

@@ -40,7 +40,7 @@
 
 #include <asm/plat-s3c/nand.h>
 
-#include <asm/plat-s3c24xx/common-smdk.h>
+#include <plat/common-smdk.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
 

+ 2 - 2
arch/arm/plat-s3c24xx/cpu.c

@@ -46,10 +46,10 @@
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/s3c2400.h>
 #include <plat/s3c2410.h>
-#include <asm/plat-s3c24xx/s3c2412.h>
+#include <plat/s3c2412.h>
 #include "s3c244x.h"
 #include <plat/s3c2440.h>
 #include <plat/s3c2442.h>

+ 1 - 1
arch/arm/plat-s3c24xx/dma.c

@@ -36,7 +36,7 @@
 #include <asm/mach/dma.h>
 #include <mach/map.h>
 
-#include <asm/plat-s3c24xx/dma.h>
+#include <plat/dma.h>
 
 /* io map for dma */
 static void __iomem *dma_base;

+ 0 - 0
include/asm-arm/plat-s3c24xx/clock.h → arch/arm/plat-s3c24xx/include/plat/clock.h


+ 0 - 0
include/asm-arm/plat-s3c24xx/common-smdk.h → arch/arm/plat-s3c24xx/include/plat/common-smdk.h


+ 0 - 0
include/asm-arm/plat-s3c24xx/dma.h → arch/arm/plat-s3c24xx/include/plat/dma.h


+ 0 - 0
include/asm-arm/plat-s3c24xx/s3c2412.h → arch/arm/plat-s3c24xx/include/plat/s3c2412.h


+ 1 - 1
arch/arm/plat-s3c24xx/pwm-clock.c

@@ -24,7 +24,7 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 #include <plat/regs-timer.h>

+ 1 - 1
arch/arm/plat-s3c24xx/s3c244x-clock.c

@@ -41,7 +41,7 @@
 
 #include <mach/regs-clock.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 static int s3c2440_setparent_armclk(struct clk *clk, struct clk *parent)

+ 1 - 1
arch/arm/plat-s3c24xx/s3c244x.c

@@ -38,7 +38,7 @@
 #include <plat/s3c2410.h>
 #include <plat/s3c2440.h>
 #include "s3c244x.h"
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>

+ 1 - 1
arch/arm/plat-s3c24xx/time.c

@@ -37,7 +37,7 @@
 #include <mach/regs-irq.h>
 #include <asm/mach/time.h>
 
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
 #include <plat/cpu.h>
 
 static unsigned long timer_startval;