---

yaml --- r: 187659 b: refs/heads/master c: 6ce8fde h: refs/heads/master i: 187657: e098261 187655: 08a75f0 v: v3
git-mirror · Feb 20, 2010 · 8f55385 · 8f55385
1 parent 88f181b
commit 8f55385
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 39 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7be9abaa5f4a64fdcca6808bb7eacb3547e574e
+refs/heads/master: 6ce8fde296e56cda9d7416e015ed2fe495c9c48c
diff --git a/trunk/arch/arm/mach-s3c64xx/Kconfig b/trunk/arch/arm/mach-s3c64xx/Kconfig
@@ -7,14 +7,12 @@
 
 config CPU_S3C6400
 	bool
-	select CPU_S3C6400_INIT
 	select CPU_S3C6400_CLOCK
 	help
 	  Enable S3C6400 CPU support
 
 config CPU_S3C6410
 	bool
-	select CPU_S3C6400_INIT
 	select CPU_S3C6400_CLOCK
 	help
 	  Enable S3C6410 CPU support

diff --git a/trunk/arch/arm/mach-s3c64xx/cpu.c b/trunk/arch/arm/mach-s3c64xx/cpu.c
@@ -129,6 +129,12 @@ static struct sys_device s3c64xx_sysdev = {
 	.cls	= &s3c64xx_sysclass,
 };
 
+/* uart registration process */
+
+void __init s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
+{
+	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
+}
 
 /* read cpu identification code */
 

diff --git a/trunk/arch/arm/plat-s3c64xx/Kconfig b/trunk/arch/arm/plat-s3c64xx/Kconfig
@@ -30,12 +30,6 @@ if PLAT_S3C64XX
 
 # Configuration options shared by all S3C64XX implementations
 
-config CPU_S3C6400_INIT
-	bool
-	help
-	  Common initialisation code for the S3C6400 that is shared
-	  by other CPUs in the series, such as the S3C6410.
-
 config CPU_S3C6400_CLOCK
 	bool
 	help

diff --git a/trunk/arch/arm/plat-s3c64xx/Makefile b/trunk/arch/arm/plat-s3c64xx/Makefile
@@ -12,5 +12,4 @@ obj-				:=
 
 # CPU support
 
-obj-$(CONFIG_CPU_S3C6400_INIT)	+= s3c6400-init.o
 obj-$(CONFIG_CPU_S3C6400_CLOCK)	+= s3c6400-clock.o
diff --git a/trunk/arch/arm/plat-s3c64xx/s3c6400-init.c b/trunk/arch/arm/plat-s3c64xx/s3c6400-init.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,5 +12,4 @@ obj- :=

		# CPU support

		obj-$(CONFIG_CPU_S3C6400_INIT) += s3c6400-init.o
		obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o