ARM: S3C64XX: Merge s3c6400-init.c into cpu.c
authorBen Dooks <ben-linux@fluff.org>
Tue, 26 Jan 2010 05:32:09 +0000 (14:32 +0900)
committerBen Dooks <ben-linux@fluff.org>
Sat, 20 Feb 2010 22:34:01 +0000 (22:34 +0000)
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>
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/cpu.c
arch/arm/plat-s3c64xx/Kconfig
arch/arm/plat-s3c64xx/Makefile
arch/arm/plat-s3c64xx/s3c6400-init.c [deleted file]

index 7c9cd9a..33d82b1 100644 (file)
@@ -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
index 410d688..374e45e 100644 (file)
@@ -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 */
 
index fb7e25f..cc30089 100644 (file)
@@ -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
index bd4fe3b..62fc253 100644 (file)
@@ -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
+++ /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);
-}