Move the ARM Samsung s3c2xx0 support files into the samsung directory, to

match other platforms.

Discussed with:	andrew

25 files changed, 42 insertions, 42 deletions

diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC
index 4c7480c..d4407eb 100644
--- a/sys/arm/conf/LN2410SBC
+++ b/sys/arm/conf/LN2410SBC
@@ -19,7 +19,7 @@
 
 ident		LN2410SBC
 
-include 	"../s3c2xx0/std.ln2410sbc"
+include 	"../samsung/s3c2xx0/std.ln2410sbc"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
 makeoptions	MODULES_OVERRIDE=""
diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index 6a0218d..fa413bf 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -19,7 +19,7 @@ files	"../mv/discovery/files.db78xxx"
 files	"../mv/kirkwood/files.kirkwood"
 files	"../mv/orion/files.db88f5xxx"
 files	"../mv/orion/files.ts7800"
-files	"../s3c2xx0/files.s3c2xx0"
+files	"../samsung/s3c2xx0/files.s3c2xx0"
 files	"../xscale/i80321/files.ep80219"
 files	"../xscale/i80321/files.i80219"
 files	"../xscale/i80321/files.i80321"
diff --git a/sys/arm/s3c2xx0/files.s3c2xx0 b/sys/arm/s3c2xx0/files.s3c2xx0
deleted file mode 100644
index 5ad2890..0000000
--- a/sys/arm/s3c2xx0/files.s3c2xx0
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-arm/arm/bus_space_asm_generic.S	standard
-arm/arm/bus_space_generic.c	standard
-arm/arm/cpufunc_asm_arm9.S	standard
-arm/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
-arm/s3c2xx0/s3c24x0_rtc.c	standard
-arm/s3c2xx0/s3c24x0_machdep.c	standard
-arm/s3c2xx0/s3c24x0.c   	standard
-arm/s3c2xx0/s3c2xx0_space.c	standard
-arm/s3c2xx0/s3c24x0_clk.c	standard
-arm/s3c2xx0/uart_bus_s3c2410.c	optional	uart
-arm/s3c2xx0/uart_cpu_s3c2410.c	optional	uart
-arm/s3c2xx0/uart_dev_s3c2410.c	optional	uart
-
-dev/usb/controller/ohci_s3c24x0.c	optional	ohci
diff --git a/sys/arm/s3c2xx0/board_ln2410sbc.c b/sys/arm/samsung/s3c2xx0/board_ln2410sbc.c
index 5f5ac90..d0f474e 100644
--- a/sys/arm/s3c2xx0/board_ln2410sbc.c
+++ b/sys/arm/samsung/s3c2xx0/board_ln2410sbc.c
@@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2xx0board.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0board.h>
 
 extern vm_offset_t s3c2410_uart_vaddr;
 
diff --git a/sys/arm/samsung/s3c2xx0/files.s3c2xx0 b/sys/arm/samsung/s3c2xx0/files.s3c2xx0
new file mode 100644
index 0000000..eb02fc5
--- /dev/null
+++ b/sys/arm/samsung/s3c2xx0/files.s3c2xx0
@@ -0,0 +1,15 @@
+# $FreeBSD$
+arm/arm/bus_space_asm_generic.S	standard
+arm/arm/bus_space_generic.c	standard
+arm/arm/cpufunc_asm_arm9.S	standard
+arm/samsung/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
+arm/samsung/s3c2xx0/s3c24x0_rtc.c	standard
+arm/samsung/s3c2xx0/s3c24x0_machdep.c	standard
+arm/samsung/s3c2xx0/s3c24x0.c   	standard
+arm/samsung/s3c2xx0/s3c2xx0_space.c	standard
+arm/samsung/s3c2xx0/s3c24x0_clk.c	standard
+arm/samsung/s3c2xx0/uart_bus_s3c2410.c	optional	uart
+arm/samsung/s3c2xx0/uart_cpu_s3c2410.c	optional	uart
+arm/samsung/s3c2xx0/uart_dev_s3c2410.c	optional	uart
+
+dev/usb/controller/ohci_s3c24x0.c	optional	ohci
diff --git a/sys/arm/s3c2xx0/s3c2410reg.h b/sys/arm/samsung/s3c2xx0/s3c2410reg.h
index 89298ea..e13ee3c 100644
--- a/sys/arm/s3c2xx0/s3c2410reg.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2410reg.h
@@ -42,7 +42,7 @@
 #define	_ARM_S3C2XX0_S3C2410REG_H_
 
 /* common definitions for S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 /*
  * Memory Map
diff --git a/sys/arm/s3c2xx0/s3c2410var.h b/sys/arm/samsung/s3c2xx0/s3c2410var.h
index b17784d..1ce9b99 100644
--- a/sys/arm/s3c2xx0/s3c2410var.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2410var.h
@@ -34,7 +34,7 @@
 #ifndef _ARM_S3C2410VAR_H_
 #define _ARM_S3C2410VAR_H_
 
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 
 int	s3c2410_sscom_cnattach(bus_space_tag_t, int, int, int, tcflag_t);
 int	s3c2410_sscom_kgdb_attach(bus_space_tag_t, int, int, int, tcflag_t);
diff --git a/sys/arm/s3c2xx0/s3c2440reg.h b/sys/arm/samsung/s3c2xx0/s3c2440reg.h
index f3cda60..2304b69 100644
--- a/sys/arm/s3c2xx0/s3c2440reg.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2440reg.h
@@ -36,7 +36,7 @@
 #define	_ARM_S3C2XX0_S3C2440REG_H_
 
 /* common definitions for S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 /*
  * Memory Map
diff --git a/sys/arm/s3c2xx0/s3c24x0.c b/sys/arm/samsung/s3c2xx0/s3c24x0.c
index 01e1135..49acdc6 100644
--- a/sys/arm/s3c2xx0/s3c24x0.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0.c
@@ -49,9 +49,9 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpufunc.h>
 #include <machine/intr.h>
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2440reg.h>
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2440reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 #include <sys/rman.h>
 
 #define S3C2XX0_XTAL_CLK 12000000
diff --git a/sys/arm/s3c2xx0/s3c24x0_clk.c b/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
index 35ce349..d4c4e98 100644
--- a/sys/arm/s3c2xx0/s3c24x0_clk.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
@@ -48,8 +48,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
-#include <arm/s3c2xx0/s3c24x0reg.h>
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 
 struct s3c24x0_timer_softc {
 	device_t	dev;
diff --git a/sys/arm/s3c2xx0/s3c24x0_machdep.c b/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
index 5264e7a..411447b 100644
--- a/sys/arm/s3c2xx0/s3c24x0_machdep.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
@@ -89,9 +89,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <sys/reboot.h>
 
-#include <arm/s3c2xx0/s3c24x0var.h>
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2xx0board.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0board.h>
 
 /* Page table for mapping proc0 zero page */
 #define KERNEL_PT_SYS		0
diff --git a/sys/arm/s3c2xx0/s3c24x0_rtc.c b/sys/arm/samsung/s3c2xx0/s3c24x0_rtc.c
index 8845c44..f0d35c9 100644
--- a/sys/arm/s3c2xx0/s3c24x0_rtc.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0_rtc.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 #include "clock_if.h"
 
diff --git a/sys/arm/s3c2xx0/s3c24x0reg.h b/sys/arm/samsung/s3c2xx0/s3c24x0reg.h
index e60ce88..2004e11 100644
--- a/sys/arm/s3c2xx0/s3c24x0reg.h
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0reg.h
@@ -43,7 +43,7 @@
 #define	_ARM_S3C2XX0_S3C24X0REG_H_
 
 /* common definitions for S3C2800, S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c2xx0reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0reg.h>
 
 /*
  * Map the device registers into kernel space.
diff --git a/sys/arm/s3c2xx0/s3c24x0var.h b/sys/arm/samsung/s3c2xx0/s3c24x0var.h
index 5209da8..2ee042e 100644
--- a/sys/arm/s3c2xx0/s3c24x0var.h
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0var.h
@@ -34,7 +34,7 @@
 #ifndef _ARM_S3C24X0VAR_H_
 #define _ARM_S3C24X0VAR_H_
 
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 
 struct s3c24x0_softc {
 	struct s3c2xx0_softc  sc_sx;
diff --git a/sys/arm/s3c2xx0/s3c2xx0_space.c b/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
index fe01d2b..fe01d2b 100644
--- a/sys/arm/s3c2xx0/s3c2xx0_space.c
+++ b/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
diff --git a/sys/arm/s3c2xx0/s3c2xx0board.h b/sys/arm/samsung/s3c2xx0/s3c2xx0board.h
index 8a2c631..8a2c631 100644
--- a/sys/arm/s3c2xx0/s3c2xx0board.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2xx0board.h
diff --git a/sys/arm/s3c2xx0/s3c2xx0reg.h b/sys/arm/samsung/s3c2xx0/s3c2xx0reg.h
index 627c3ca..627c3ca 100644
--- a/sys/arm/s3c2xx0/s3c2xx0reg.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2xx0reg.h
diff --git a/sys/arm/s3c2xx0/s3c2xx0var.h b/sys/arm/samsung/s3c2xx0/s3c2xx0var.h
index fea0982..fea0982 100644
--- a/sys/arm/s3c2xx0/s3c2xx0var.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2xx0var.h
diff --git a/sys/arm/s3c2xx0/std.ln2410sbc b/sys/arm/samsung/s3c2xx0/std.ln2410sbc
index a76a849..1f1143e 100644
--- a/sys/arm/s3c2xx0/std.ln2410sbc
+++ b/sys/arm/samsung/s3c2xx0/std.ln2410sbc
@@ -1,5 +1,5 @@
 #$FreeBSD$
-include "../s3c2xx0/std.s3c2410"
+include "../samsung/s3c2xx0/std.s3c2410"
 
 makeoptions	KERNPHYSADDR=0x30000000
 makeoptions	KERNVIRTADDR=0xc0000000
diff --git a/sys/arm/s3c2xx0/std.s3c2410 b/sys/arm/samsung/s3c2xx0/std.s3c2410
index 266d9e7..4f55b93 100644
--- a/sys/arm/s3c2xx0/std.s3c2410
+++ b/sys/arm/samsung/s3c2xx0/std.s3c2410
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-files	"../s3c2xx0/files.s3c2xx0"
+files	"../samsung/s3c2xx0/files.s3c2xx0"
 cpu	CPU_ARM9
 machine 	arm
 
diff --git a/sys/arm/s3c2xx0/uart_bus_s3c2410.c b/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c
index 41c750a..2102d8b 100644
--- a/sys/arm/s3c2xx0/uart_bus_s3c2410.c
+++ b/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c
@@ -15,7 +15,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart_bus.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 #include "uart_if.h"
 
diff --git a/sys/arm/s3c2xx0/uart_cpu_s3c2410.c b/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
index 2ed036b..37b668e 100644
--- a/sys/arm/s3c2xx0/uart_cpu_s3c2410.c
+++ b/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;
diff --git a/sys/arm/s3c2xx0/uart_dev_s3c2410.c b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
index aadd835..2ee1217 100644
--- a/sys/arm/s3c2xx0/uart_dev_s3c2410.c
+++ b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
@@ -41,10 +41,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 #include <dev/uart/uart_bus.h>
-#include <arm/s3c2xx0/s3c2440reg.h>
-#include <arm/s3c2xx0/uart_dev_s3c2410.h>
-#include <arm/s3c2xx0/s3c2xx0reg.h>
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2440reg.h>
+#include <arm/samsung/s3c2xx0/uart_dev_s3c2410.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 #include "uart_if.h"
 
 /* Finds the subirq from the parent */
diff --git a/sys/arm/s3c2xx0/uart_dev_s3c2410.h b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.h
index 5479796..5479796 100644
--- a/sys/arm/s3c2xx0/uart_dev_s3c2410.h
+++ b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.h
diff --git a/sys/dev/usb/controller/ohci_s3c24x0.c b/sys/dev/usb/controller/ohci_s3c24x0.c
index 225a2d2..08624d2 100644
--- a/sys/dev/usb/controller/ohci_s3c24x0.c
+++ b/sys/dev/usb/controller/ohci_s3c24x0.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/rman.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 static device_probe_t ohci_s3c24x0_probe;
 static device_attach_t ohci_s3c24x0_attach;