Merge branch 'for-next/arm' into next

8 files changed, 9 insertions, 223 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 6fda32d44c..7c9a46845a 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -107,24 +107,6 @@ config DRIVER_SERIAL_PL010
 	help
 	  Enable this to get support for AMBA PL010 based serial devices
 
-config DRIVER_SERIAL_S3C_IMPROVED
-	bool
-
-config DRIVER_SERIAL_S3C
-	bool "Samsung S3C serial driver"
-	depends on ARCH_SAMSUNG
-	select DRIVER_SERIAL_S3C_IMPROVED if (CPU_S5PC110 || CPU_S5PV210 || CPU_S3C6410)
-	default y
-	help
-	  Say Y here if you want to use the CONS on a Samsung S3C CPU
-
-config DRIVER_SERIAL_S3C_AUTOSYNC
-	bool "Enable auto flow"
-	depends on DRIVER_SERIAL_S3C
-	help
-	  Say Y here if you want to use the auto flow feature of this
-	  UART. RTS and CTS will be handled by the hardware when enabled.
-
 config DRIVER_SERIAL_PXA
 	bool "PXA serial driver"
 	depends on ARCH_PXA
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 4b2bfb0537..5677dba631 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -12,7 +12,6 @@ obj-$(CONFIG_DRIVER_SERIAL_CLPS711X)		+= serial_clps711x.o
 obj-$(CONFIG_DRIVER_SERIAL_NS16550)		+= serial_ns16550.o
 obj-$(CONFIG_DRIVER_SERIAL_NS16550_PCI)		+= serial_ns16550_pci.o
 obj-$(CONFIG_DRIVER_SERIAL_PL010)		+= serial_pl010.o
-obj-$(CONFIG_DRIVER_SERIAL_S3C)			+= serial_s3c.o
 obj-$(CONFIG_DRIVER_SERIAL_STM32)		+= serial_stm32.o
 obj-$(CONFIG_DRIVER_SERIAL_ALTERA)		+= serial_altera.o
 obj-$(CONFIG_DRIVER_SERIAL_ALTERA_JTAG)		+= serial_altera_jtag.o
diff --git a/drivers/serial/serial_auart.c b/drivers/serial/serial_auart.c
index a0163bef6f..2ac7349c66 100644
--- a/drivers/serial/serial_auart.c
+++ b/drivers/serial/serial_auart.c
@@ -36,8 +36,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 
-#include <mach/clock.h>
-
 #define HW_UARTAPP_CTRL0		(0x00000000)
 
 #define HW_UARTAPP_CTRL2		(0x00000020)
diff --git a/drivers/serial/serial_digic.c b/drivers/serial/serial_digic.c
index 31880ca996..61ba7d06f3 100644
--- a/drivers/serial/serial_digic.c
+++ b/drivers/serial/serial_digic.c
@@ -10,7 +10,7 @@
 #include <malloc.h>
 #include <io.h>
 
-#include <mach/uart.h>
+#include <mach/digic/uart.h>
 
 /*
  * This driver is based on the "Serial terminal" docs here:
diff --git a/drivers/serial/serial_omap4_usbboot.c b/drivers/serial/serial_omap4_usbboot.c
index ea018444d5..709398966f 100644
--- a/drivers/serial/serial_omap4_usbboot.c
+++ b/drivers/serial/serial_omap4_usbboot.c
@@ -4,7 +4,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
-#include <mach/omap4_rom_usb.h>
+#include <mach/omap/omap4_rom_usb.h>
 
 struct serial_omap4_usbboot_priv {
 	struct console_device cdev;
@@ -49,6 +49,12 @@ static int serial_omap4_usbboot_getc(struct console_device *cdev)
 static int serial_omap4_usbboot_probe(struct device *dev)
 {
 	struct serial_omap4_usbboot_priv *priv;
+	int ret;
+
+	ret = omap4_usbboot_open();
+	if (ret)
+		return ret;
+	
 	priv = xzalloc(sizeof(*priv));
 
 	priv->cdev.dev = dev;
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 9a591a0be8..97342f923e 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -9,7 +9,7 @@
 #include <init.h>
 #include <malloc.h>
 
-#include <mach/clock.h>
+#include <mach/pxa/clock.h>
 #include <asm/io.h>
 
 #define RBR		0x00	/* Receive Buffer Register (read only) */
diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c
deleted file mode 100644
index 5f6f2082eb..0000000000
--- a/drivers/serial/serial_s3c.c
+++ /dev/null
@@ -1,198 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * (c) 2009...2011 Juergen Beisert <j.beisert@pengutronix.de>
- *
- * Based on code from:
- * (c) 2004 Sascha Hauer <sascha@saschahauer.de>
- */
-
-#include <common.h>
-#include <driver.h>
-#include <init.h>
-#include <malloc.h>
-#include <io.h>
-#include <mach/s3c-generic.h>
-#include <mach/s3c-iomap.h>
-
-/* Note: Offsets are for little endian access */
-#define ULCON 0x00		/* line control */
-#define UCON 0x04		/* UART control */
-# define UCON_SET_CLK_SRC(x) (((x) & 0x03) << 10)
-# define UCON_GET_CLK_SRC(x) (((x) >> 10) & 0x03)
-#define UFCON 0x08		/* FIFO control */
-#define UMCON 0x0c		/* modem control */
-#define UTRSTAT 0x10		/* Rx/Tx status */
-#define UERSTAT 0x14		/* error status */
-#define UFSTAT 0x18		/* FIFO status */
-#define UMSTAT 0x1c		/* modem status */
-#define UTXH 0x20		/* transmitt */
-#define URXH 0x24		/* receive */
-#define UBRDIV 0x28		/* baudrate generator */
-#define UBRDIVSLOT 0x2c		/* baudrate slot generator */
-#define UINTM 0x38		/* interrupt mask register */
-
-struct s3c_uart {
-	void __iomem *regs;
-	struct console_device cdev;
-};
-
-#define to_s3c_uart(c)	container_of(c, struct s3c_uart, cdev)
-
-/* each architecture has a preferred reference clock for its UARTs */
-static unsigned s3c_select_arch_input_clock(void)
-{
-	/* S3C24xx: 0=2=PCLK, 1=UEXTCLK, 3=FCLK/n */
-	if (IS_ENABLED(CONFIG_ARCH_S3C24xx))
-		return 0;	/* use the internal PCLK */
-	/* S3C64xx: 0=2=PCLK, 1=UCLK0, 3=UCLK1 */
-	if (IS_ENABLED(CONFIG_ARCH_S3C64xx))
-		return 3;	/* use the internal UCLK1 */
-	/* S5PCxx: 0=PCLK, 1=SCLK_UART */
-	if (IS_ENABLED(CONFIG_ARCH_S5PCxx))
-		return 0;	/* use the internal PCLK */
-}
-
-static unsigned s3c_get_arch_uart_input_clock(void __iomem *base)
-{
-	unsigned reg = readw(base + UCON);
-	return s3c_get_uart_clk(UCON_GET_CLK_SRC(reg));
-}
-
-/*
- * This table takes the fractional value of the baud divisor and gives
- * the recommended setting for the UDIVSLOT register. Refer the datasheet
- * for further details
- */
-static const uint16_t udivslot_table[] __maybe_unused = {
-	0x0000, 0x0080, 0x0808, 0x0888, 0x2222, 0x4924, 0x4A52, 0x54AA,
-	0x5555, 0xD555, 0xD5D5, 0xDDD5, 0xDDDD, 0xDFDD, 0xDFDF, 0xFFDF,
-};
-
-static int s3c_serial_setbaudrate(struct console_device *cdev, int baudrate)
-{
-	struct s3c_uart *priv = to_s3c_uart(cdev);
-	void __iomem *base = priv->regs;
-	unsigned val;
-
-	if (IS_ENABLED(CONFIG_DRIVER_SERIAL_S3C_IMPROVED)) {
-		val = s3c_get_arch_uart_input_clock(base) / baudrate;
-		writew(udivslot_table[val & 15], base + UBRDIVSLOT);
-	}
-
-	val = s3c_get_arch_uart_input_clock(base) / (16 * baudrate) - 1;
-	writew(val, base + UBRDIV);
-
-	return 0;
-}
-
-static int s3c_serial_init_port(struct console_device *cdev)
-{
-	struct s3c_uart *priv = to_s3c_uart(cdev);
-	void __iomem *base = priv->regs;
-
-	/* FIFO enable, Tx/Rx FIFO clear */
-	writeb(0x07, base + UFCON);
-	writeb(0x00, base + UMCON);
-
-	/* Normal,No parity,1 stop,8 bit */
-	writeb(0x03, base + ULCON);
-
-	/*
-	 * S3C2440 SoC:
-	 *  - no clock divider
-	 * all SoCs:
-	 *  - enable receive and transmit mode
-	 */
-	writew(0x0005 | UCON_SET_CLK_SRC(s3c_select_arch_input_clock()),
-						base + UCON);
-
-	if (IS_ENABLED(CONFIG_DRIVER_SERIAL_S3C_IMPROVED))
-		/* 'interrupt or polling mode' for both directions */
-		writeb(0xf, base + UINTM);
-
-	if (IS_ENABLED(CONFIG_DRIVER_SERIAL_S3C_AUTOSYNC))
-		writeb(0x10, base + UMCON); /* enable auto flow control */
-	else
-		writeb(0x01, base + UMCON); /* RTS up */
-
-	return 0;
-}
-
-static void s3c_serial_putc(struct console_device *cdev, char c)
-{
-	struct s3c_uart *priv = to_s3c_uart(cdev);
-	void __iomem *base = priv->regs;
-
-	/* Wait for Tx FIFO not full */
-	while (!(readb(base + UTRSTAT) & 0x2))
-		;
-
-	writeb(c, base + UTXH);
-}
-
-static int s3c_serial_tstc(struct console_device *cdev)
-{
-	struct s3c_uart *priv = to_s3c_uart(cdev);
-	void __iomem *base = priv->regs;
-
-	/* If receive fifo is empty, return false */
-	if (readb(base + UTRSTAT) & 0x1)
-		return 1;
-
-	return 0;
-}
-
-static int s3c_serial_getc(struct console_device *cdev)
-{
-	struct s3c_uart *priv = to_s3c_uart(cdev);
-	void __iomem *base = priv->regs;
-
-	/* wait for a character */
-	while (!(readb(base + UTRSTAT) & 0x1))
-		;
-
-	return readb(base + URXH);
-}
-
-static void s3c_serial_flush(struct console_device *cdev)
-{
-	struct s3c_uart *priv = to_s3c_uart(cdev);
-	void __iomem *base = priv->regs;
-
-	while (!(readb(base + UTRSTAT) & 0x4))
-		;
-}
-
-static int s3c_serial_probe(struct device *dev)
-{
-	struct resource *iores;
-	struct s3c_uart *priv;
-	struct console_device *cdev;
-
-	priv = xzalloc(sizeof(struct s3c_uart));
-	cdev = &priv->cdev;
-	iores = dev_request_mem_resource(dev, 0);
-	if (IS_ERR(iores))
-		return PTR_ERR(iores);
-	priv->regs = IOMEM(iores->start);
-	dev->priv = priv;
-	cdev->dev = dev;
-	cdev->tstc = s3c_serial_tstc;
-	cdev->putc = s3c_serial_putc;
-	cdev->getc = s3c_serial_getc;
-	cdev->flush = s3c_serial_flush;
-	cdev->setbrg = s3c_serial_setbaudrate;
-
-	s3c_serial_init_port(cdev);
-
-	/* Enable UART */
-	console_register(cdev);
-
-	return 0;
-}
-
-static struct driver s3c_serial_driver = {
-	.name   = "s3c_serial",
-	.probe  = s3c_serial_probe,
-};
-console_platform_driver(s3c_serial_driver);
diff --git a/drivers/serial/stm-serial.c b/drivers/serial/stm-serial.c
index bddb422ac5..e7c04654d2 100644
--- a/drivers/serial/stm-serial.c
+++ b/drivers/serial/stm-serial.c
@@ -20,7 +20,6 @@
 #include <malloc.h>
 #include <linux/clk.h>
 #include <linux/err.h>
-#include <mach/clock.h>
 
 #define UARTDBGDR 0x00
 #define UARTDBGFR 0x18