ARM: S3C64XX: Merge s3c6400-init.c into cpu.c

Since this file is small, and is compiled for both systems in this
architecture merge it into the cpu support file and remove the original
instead of moving it.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 7c9cd9a9901a9df333b043976847ccfb3264916c..33d82b1c9eff819995f648486bff41405fc346bf 100644 (file)
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/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/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c
index 410d688a691072e01790de4e68c3c78605abb49c..374e45e566b8cd66c97672b7d8471af61a2363b3 100644 (file)
--- a/arch/arm/mach-s3c64xx/cpu.c
+++ b/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/arch/arm/plat-s3c64xx/Kconfig b/arch/arm/plat-s3c64xx/Kconfig
index fb7e25f710e060c035497f429d5ec29f09c8f67e..cc300894f364cbf6d4aa3a3e26c6a6af7ee309fd 100644 (file)
--- a/arch/arm/plat-s3c64xx/Kconfig
+++ b/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/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile
index bd4fe3b48eaa91a704da886ff7f599351a9e5213..62fc25305ec4ccd4c1f3eeeac26b423d695c0e04 100644 (file)
--- a/arch/arm/plat-s3c64xx/Makefile
+++ b/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/arch/arm/plat-s3c64xx/s3c6400-init.c b/arch/arm/plat-s3c64xx/s3c6400-init.c
deleted file mode 100644 (file)
index e64caa4..0000000
--- a/arch/arm/plat-s3c64xx/s3c6400-init.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* linux/arch/arm/plat-s3c64xx/s3c6400-init.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C6400 - CPU initialisation (common with other S3C64XX chips)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-
-#include <plat/cpu.h>
-#include <plat/devs.h>
-#include <mach/s3c6400.h>
-#include <mach/s3c6410.h>
-
-/* 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);
-}