ARM: s3c: remove s3c6400 support

No board file and no dts file references the s3c6400 now, it's only
s3c6410, so remove the final bits as well.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-s3c/Makefile.s3c64xx b/arch/arm/mach-s3c/Makefile.s3c64xx
index 13cda2fe7b6cf19f981659aea91e6555fc3122a7..61287ad2ea4276bf67d083672fbb7c234e2e215b 100644 (file)
--- a/arch/arm/mach-s3c/Makefile.s3c64xx
+++ b/arch/arm/mach-s3c/Makefile.s3c64xx
@@ -16,7 +16,6 @@ obj-$(CONFIG_PM_SLEEP)          += irq-pm-s3c64xx.o
 # Core
 
 obj-y                          += s3c64xx.o
-obj-$(CONFIG_CPU_S3C6400)      += s3c6400.o
 obj-$(CONFIG_CPU_S3C6410)      += s3c6410.o
 
 # DMA support

diff --git a/arch/arm/mach-s3c/s3c6400.c b/arch/arm/mach-s3c/s3c6400.c
deleted file mode 100644 (file)
index d47f1d6..0000000
--- a/arch/arm/mach-s3c/s3c6400.c
+++ /dev/null
@@ -1,84 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-//
-// Copyright 2009 Simtec Electronics
-//     Ben Dooks <ben@simtec.co.uk>
-//     http://armlinux.simtec.co.uk/
-
-/*
- * NOTE: Code in this file is not used when booting with Device Tree support.
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/device.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/platform_device.h>
-#include <linux/of.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <asm/irq.h>
-
-#include "regs-clock.h"
-
-#include "cpu.h"
-#include "devs.h"
-#include "sdhci.h"
-#include "iic-core.h"
-
-#include "s3c64xx.h"
-
-void __init s3c6400_map_io(void)
-{
-       /* setup SDHCI */
-
-       s3c6400_default_sdhci0();
-       s3c6400_default_sdhci1();
-       s3c6400_default_sdhci2();
-
-       /* the i2c devices are directly compatible with s3c2440 */
-       s3c_i2c0_setname("s3c2440-i2c");
-}
-
-void __init s3c6400_init_irq(void)
-{
-       /* VIC0 does not have IRQS 5..7,
-        * VIC1 is fully populated. */
-       s3c64xx_init_irq(~0 & ~(0xf << 5), ~0);
-}
-
-static struct bus_type s3c6400_subsys = {
-       .name           = "s3c6400-core",
-       .dev_name       = "s3c6400-core",
-};
-
-static struct device s3c6400_dev = {
-       .bus    = &s3c6400_subsys,
-};
-
-static int __init s3c6400_core_init(void)
-{
-       /* Not applicable when using DT. */
-       if (of_have_populated_dt() || soc_is_s3c64xx())
-               return 0;
-
-       return subsys_system_register(&s3c6400_subsys, NULL);
-}
-
-core_initcall(s3c6400_core_init);
-
-int __init s3c6400_init(void)
-{
-       printk("S3C6400: Initialising architecture\n");
-
-       return device_register(&s3c6400_dev);
-}

diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c
index 0a8116c108fe4cdde66b139714ab3fd14ae2a80e..ad13d7e13e5edfe6cd03d1f2ff853eda1e89a82a 100644 (file)
--- a/arch/arm/mach-s3c/s3c64xx.c
+++ b/arch/arm/mach-s3c/s3c64xx.c
@@ -72,18 +72,10 @@ static void __init s3c64xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 
 /* table of supported CPUs */
 
-static const char name_s3c6400[] = "S3C6400";
 static const char name_s3c6410[] = "S3C6410";
 
 static struct cpu_table cpu_ids[] __initdata = {
        {
-               .idcode         = S3C6400_CPU_ID,
-               .idmask         = S3C64XX_CPU_MASK,
-               .map_io         = s3c6400_map_io,
-               .init_uarts     = s3c64xx_init_uarts,
-               .init           = s3c6400_init,
-               .name           = name_s3c6400,
-       }, {
                .idcode         = S3C6410_CPU_ID,
                .idmask         = S3C64XX_CPU_MASK,
                .map_io         = s3c6410_map_io,