Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: mach-loki: delete
  ARM: mach-s3c2400: delete
  ARM: mach-s3c24a0: delete

4 files changed, 0 insertions, 239 deletions

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 636144cea932..8f41e1123461 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -457,7 +457,6 @@ config SERIAL_SAMSUNG_UARTS_4
 config SERIAL_SAMSUNG_UARTS
         int
         depends on ARM && PLAT_SAMSUNG
-        default 2 if ARCH_S3C2400
         default 6 if ARCH_S5P6450
         default 4 if SERIAL_SAMSUNG_UARTS_4
         default 3
@@ -489,13 +488,6 @@ config SERIAL_SAMSUNG_CONSOLE
           your boot loader about how to pass options to the kernel at
           boot time.)
 
-config SERIAL_S3C2400
-        tristate "Samsung S3C2410 Serial port support"
-        depends on ARM && SERIAL_SAMSUNG && CPU_S3C2400
-        default y if CPU_S3C2400
-        help
-          Serial port support for the Samsung S3C2400 SoC
-
 config SERIAL_S3C2410
         tristate "Samsung S3C2410 Serial port support"
         depends on SERIAL_SAMSUNG && CPU_S3C2410
@@ -519,13 +511,6 @@ config SERIAL_S3C2440
         help
           Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC
 
-config SERIAL_S3C24A0
-        tristate "Samsung S3C24A0 Serial port support"
-        depends on SERIAL_SAMSUNG && CPU_S3C24A0
-        default y if CPU_S3C24A0
-        help
-          Serial port support for the Samsung S3C24A0 SoC
-
 config SERIAL_S3C6400
         tristate "Samsung S3C6400/S3C6410/S5P6440/S5P6450/S5PC100 Serial port support"
         depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5P6450 || CPU_S5PC100)
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index cb2628fee4c7..83b4da6a1062 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -38,11 +38,9 @@ obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
 obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o
 obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
 obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
-obj-$(CONFIG_SERIAL_S3C2400) += s3c2400.o
 obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
 obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
 obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
-obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o
 obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o
 obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
diff --git a/drivers/tty/serial/s3c2400.c b/drivers/tty/serial/s3c2400.c
deleted file mode 100644
index d13051b3df87..000000000000
--- a/drivers/tty/serial/s3c2400.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Driver for Samsung SoC onboard UARTs.
- *
- * Ben Dooks, Copyright (c) 2003-2005 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *
- * 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/module.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-
-#include <asm/irq.h>
-
-#include <mach/hardware.h>
-
-#include <plat/regs-serial.h>
-#include <mach/regs-gpio.h>
-
-#include "samsung.h"
-
-static int s3c2400_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        clk->divisor = 1;
-        clk->name = "pclk";
-
-        return 0;
-}
-
-static int s3c2400_serial_setsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        return 0;
-}
-
-static int s3c2400_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        dbg("s3c2400_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-
-        wr_regl(port, S3C2410_UCON,  cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c2400_uart_inf = {
-        .name           = "Samsung S3C2400 UART",
-        .type           = PORT_S3C2400,
-        .fifosize       = 16,
-        .rx_fifomask    = S3C2410_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2410_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2410_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2410_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2410_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2410_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c2400_serial_getsource,
-        .set_clksrc     = s3c2400_serial_setsource,
-        .reset_port     = s3c2400_serial_resetport,
-};
-
-static int s3c2400_serial_probe(struct platform_device *dev)
-{
-        return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);
-}
-
-static struct platform_driver s3c2400_serial_driver = {
-        .probe          = s3c2400_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s3c2400-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-s3c24xx_console_init(&s3c2400_serial_driver, &s3c2400_uart_inf);
-
-static inline int s3c2400_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c2400_serial_driver, &s3c2400_uart_inf);
-}
-
-static inline void s3c2400_serial_exit(void)
-{
-        platform_driver_unregister(&s3c2400_serial_driver);
-}
-
-module_init(s3c2400_serial_init);
-module_exit(s3c2400_serial_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
-MODULE_DESCRIPTION("Samsung S3C2400 SoC Serial port driver");
-MODULE_ALIAS("platform:s3c2400-uart");
diff --git a/drivers/tty/serial/s3c24a0.c b/drivers/tty/serial/s3c24a0.c
deleted file mode 100644
index 914eff22e499..000000000000
--- a/drivers/tty/serial/s3c24a0.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Driver for Samsung S3C24A0 SoC onboard UARTs.
- *
- * Based on drivers/serial/s3c2410.c
- *
- * Author: Sandeep Patil <sandeep.patil@azingo.com>
- *
- * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *
- * 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/module.h>
-#include <linux/ioport.h>
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/io.h>
-#include <linux/irq.h>
-
-#include <mach/hardware.h>
-
-#include <plat/regs-serial.h>
-#include <mach/regs-gpio.h>
-
-#include "samsung.h"
-
-static int s3c24a0_serial_setsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        if (strcmp(clk->name, "uclk") == 0)
-                ucon |= S3C2410_UCON_UCLK;
-        else
-                ucon &= ~S3C2410_UCON_UCLK;
-
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-
-static int s3c24a0_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        clk->divisor = 1;
-        clk->name = (ucon & S3C2410_UCON_UCLK) ? "uclk" : "pclk";
-
-        return 0;
-}
-
-static int s3c24a0_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        dbg("s3c24a0_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-
-        wr_regl(port, S3C2410_UCON,  cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c24a0_uart_inf = {
-        .name           = "Samsung S3C24A0 UART",
-        .type           = PORT_S3C2410,
-        .fifosize       = 16,
-        .rx_fifomask    = S3C24A0_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C24A0_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C24A0_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C24A0_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C24A0_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C24A0_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c24a0_serial_getsource,
-        .set_clksrc     = s3c24a0_serial_setsource,
-        .reset_port     = s3c24a0_serial_resetport,
-};
-
-static int s3c24a0_serial_probe(struct platform_device *dev)
-{
-        return s3c24xx_serial_probe(dev, &s3c24a0_uart_inf);
-}
-
-static struct platform_driver s3c24a0_serial_driver = {
-        .probe          = s3c24a0_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s3c24a0-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-s3c24xx_console_init(&s3c24a0_serial_driver, &s3c24a0_uart_inf);
-
-static int __init s3c24a0_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c24a0_serial_driver, &s3c24a0_uart_inf);
-}
-
-static void __exit s3c24a0_serial_exit(void)
-{
-        platform_driver_unregister(&s3c24a0_serial_driver);
-}
-
-module_init(s3c24a0_serial_init);
-module_exit(s3c24a0_serial_exit);
-