Selaa lähdekoodia

[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>
Ben Dooks 18 vuotta sitten
vanhempi
commit
531b617c71
44 muutettua tiedostoa jossa 45 lisäystä ja 46 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/mach-amlm5900.c
  4. 3 3
      arch/arm/mach-s3c2410/mach-bast.c
  5. 1 1
      arch/arm/mach-s3c2410/mach-h1940.c
  6. 2 2
      arch/arm/mach-s3c2410/mach-n30.c
  7. 1 1
      arch/arm/mach-s3c2410/mach-otom.c
  8. 2 2
      arch/arm/mach-s3c2410/mach-qt2410.c
  9. 1 1
      arch/arm/mach-s3c2410/mach-smdk2410.c
  10. 1 1
      arch/arm/mach-s3c2410/mach-vr1000.c
  11. 1 2
      arch/arm/mach-s3c2410/s3c2410.c
  12. 1 1
      arch/arm/mach-s3c2410/sleep.S
  13. 1 1
      arch/arm/mach-s3c2412/clock.c
  14. 1 1
      arch/arm/mach-s3c2412/dma.c
  15. 1 1
      arch/arm/mach-s3c2412/mach-smdk2413.c
  16. 2 2
      arch/arm/mach-s3c2412/mach-vstms.c
  17. 1 1
      arch/arm/mach-s3c2412/s3c2412.c
  18. 1 1
      arch/arm/mach-s3c2440/dma.c
  19. 2 2
      arch/arm/mach-s3c2440/mach-anubis.c
  20. 1 1
      arch/arm/mach-s3c2440/mach-nexcoder.c
  21. 2 2
      arch/arm/mach-s3c2440/mach-osiris.c
  22. 2 2
      arch/arm/mach-s3c2440/mach-rx3715.c
  23. 1 1
      arch/arm/mach-s3c2440/mach-smdk2440.c
  24. 1 1
      arch/arm/mach-s3c2443/dma.c
  25. 1 1
      arch/arm/mach-s3c2443/mach-smdk2443.c
  26. 1 1
      arch/arm/plat-s3c24xx/common-smdk.c
  27. 1 1
      arch/arm/plat-s3c24xx/cpu.c
  28. 1 1
      arch/arm/plat-s3c24xx/devs.c
  29. 1 1
      arch/arm/plat-s3c24xx/pm.c
  30. 1 1
      arch/arm/plat-s3c24xx/s3c244x.c
  31. 1 1
      arch/arm/plat-s3c24xx/sleep.S
  32. 1 1
      arch/arm/plat-s3c24xx/time.c
  33. 1 1
      drivers/serial/s3c2410.c
  34. 1 1
      include/asm-arm/arch-s3c2410/debug-macro.S
  35. 1 1
      include/asm-arm/arch-s3c2410/system.h
  36. 2 2
      include/asm-arm/arch-s3c2410/uncompress.h
  37. 0 0
      include/asm-arm/plat-s3c/iic.h
  38. 0 0
      include/asm-arm/plat-s3c/nand.h
  39. 0 0
      include/asm-arm/plat-s3c/regs-iic.h
  40. 0 0
      include/asm-arm/plat-s3c/regs-nand.h
  41. 0 0
      include/asm-arm/plat-s3c/regs-rtc.h
  42. 0 0
      include/asm-arm/plat-s3c/regs-serial.h
  43. 0 0
      include/asm-arm/plat-s3c/regs-timer.h
  44. 0 0
      include/asm-arm/plat-s3c/regs-watchdog.h

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

@@ -37,7 +37,7 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-gpio.h>
 

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

@@ -23,7 +23,7 @@
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/dma.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-ac97.h>
 #include <asm/arch/regs-mem.h>

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

@@ -48,7 +48,7 @@
 #include <asm/mach-types.h>
 #include <asm/arch/fb.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-lcd.h>
 #include <asm/arch/regs-gpio.h>
 

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

@@ -36,13 +36,13 @@
 #include <asm/mach-types.h>
 
 //#include <asm/debug-ll.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-mem.h>
 #include <asm/arch/regs-lcd.h>
 
-#include <asm/arch/nand.h>
-#include <asm/arch/iic.h>
+#include <asm/plat-s3c/nand.h>
+#include <asm/plat-s3c/iic.h>
 #include <asm/arch/fb.h>
 
 #include <linux/mtd/mtd.h>

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

@@ -30,7 +30,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-lcd.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-clock.h>

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

@@ -33,9 +33,9 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
-#include <asm/arch/iic.h>
+#include <asm/plat-s3c/iic.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/clock.h>

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

@@ -29,7 +29,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>

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

@@ -49,9 +49,9 @@
 
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/leds-gpio.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/fb.h>
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/nand.h>
 #include <asm/arch/udc.h>
 #include <asm/arch/spi.h>
 #include <asm/arch/spi-gpio.h>

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

@@ -47,7 +47,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 
 #include <asm/plat-s3c24xx/devs.h>
 #include <asm/plat-s3c24xx/cpu.h>

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

@@ -39,7 +39,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/leds-gpio.h>
 

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

@@ -29,7 +29,7 @@
 #include <asm/irq.h>
 
 #include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/cpu.h>
@@ -40,7 +40,6 @@
 
 static struct map_desc s3c2410_iodesc[] __initdata = {
 	IODESC_ENT(CLKPWR),
-	IODESC_ENT(LCD),
 	IODESC_ENT(TIMER),
 	IODESC_ENT(WATCHDOG),
 };

+ 1 - 1
arch/arm/mach-s3c2410/sleep.S

@@ -32,7 +32,7 @@
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 
 	/* s3c2410_cpu_suspend
 	 *

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

@@ -37,7 +37,7 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-gpio.h>
 

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

@@ -24,7 +24,7 @@
 #include <asm/plat-s3c24xx/dma.h>
 #include <asm/plat-s3c24xx/cpu.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-ac97.h>
 #include <asm/arch/regs-mem.h>

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

@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 
 //#include <asm/debug-ll.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-lcd.h>
 

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

@@ -33,14 +33,14 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-lcd.h>
 
 #include <asm/arch/idle.h>
 #include <asm/arch/fb.h>
 
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/nand.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/s3c2412.h>

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

@@ -34,7 +34,7 @@
 #include <asm/arch/idle.h>
 
 #include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-power.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-gpioj.h>

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

@@ -23,7 +23,7 @@
 #include <asm/plat-s3c24xx/dma.h>
 #include <asm/plat-s3c24xx/cpu.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-ac97.h>
 #include <asm/arch/regs-mem.h>

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

@@ -34,11 +34,11 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-mem.h>
 #include <asm/arch/regs-lcd.h>
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/nand.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

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

@@ -36,7 +36,7 @@
 
 //#include <asm/debug-ll.h>
 #include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/s3c2440.h>

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

@@ -31,11 +31,11 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-mem.h>
 #include <asm/arch/regs-lcd.h>
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/nand.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

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

@@ -38,12 +38,12 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-lcd.h>
 
 #include <asm/arch/h1940.h>
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/nand.h>
 #include <asm/arch/fb.h>
 
 #include <asm/plat-s3c24xx/clock.h>

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

@@ -31,7 +31,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-lcd.h>
 

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

@@ -24,7 +24,7 @@
 #include <asm/plat-s3c24xx/dma.h>
 #include <asm/plat-s3c24xx/cpu.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-ac97.h>
 #include <asm/arch/regs-mem.h>

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

@@ -31,7 +31,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-lcd.h>
 

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

@@ -38,7 +38,7 @@
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/leds-gpio.h>
 
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/nand.h>
 
 #include <asm/plat-s3c24xx/common-smdk.h>
 #include <asm/plat-s3c24xx/devs.h>

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

@@ -38,7 +38,7 @@
 #include <asm/mach/map.h>
 
 #include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/devs.h>

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

@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/udc.h>
 
 #include <asm/plat-s3c24xx/devs.h>

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

@@ -40,7 +40,7 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-mem.h>

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

@@ -30,7 +30,7 @@
 #include <asm/irq.h>
 
 #include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-gpioj.h>
 #include <asm/arch/regs-dsc.h>

+ 1 - 1
arch/arm/plat-s3c24xx/sleep.S

@@ -32,7 +32,7 @@
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 
 /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not
  * reset the UART configuration, only enable if you really need this!

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

@@ -33,7 +33,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/arch/map.h>
-#include <asm/arch/regs-timer.h>
+#include <asm/plat-s3c/regs-timer.h>
 #include <asm/arch/regs-irq.h>
 #include <asm/mach/time.h>
 

+ 1 - 1
drivers/serial/s3c2410.c

@@ -78,7 +78,7 @@
 
 #include <asm/hardware.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 
 /* structures */

+ 1 - 1
include/asm-arm/arch-s3c2410/debug-macro.S

@@ -13,7 +13,7 @@
 */
 
 #include <asm/arch/map.h>
-#include <asm/arch/regs-serial.h>
+#include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 
 #define S3C2410_UART1_OFF (0x4000)

+ 1 - 1
include/asm-arm/arch-s3c2410/system.h

@@ -17,7 +17,7 @@
 #include <asm/arch/idle.h>
 #include <asm/arch/reset.h>
 
-#include <asm/arch/regs-watchdog.h>
+#include <asm/plat-s3c/regs-watchdog.h>
 #include <asm/arch/regs-clock.h>
 
 void (*s3c24xx_idle)(void);

+ 2 - 2
include/asm-arm/arch-s3c2410/uncompress.h

@@ -16,9 +16,9 @@
 typedef unsigned int upf_t;	/* cannot include linux/serial_core.h */
 
 /* defines for UART registers */
-#include "asm/arch/regs-serial.h"
+#include "asm/plat-s3c/regs-serial.h"
 #include "asm/arch/regs-gpio.h"
-#include "asm/arch/regs-watchdog.h"
+#include "asm/plat-s3c/regs-watchdog.h"
 
 #include <asm/arch/map.h>
 

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


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


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


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


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


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


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


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