ns16550: unify serial_dw

Unify serial_dw, and use the generic binding.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 1663ca20bbb62b01081d70ac7f1ca0e0298421c1..2a83756354d8482a74580fa07961c71feef16ba6 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ALTERA_UART) += altera_uart.o
 obj-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o
 obj-$(CONFIG_ARM_DCC) += arm_dcc.o
 obj-$(CONFIG_ATMEL_USART) += atmel_usart.o
-obj-$(CONFIG_DW_SERIAL) += serial_dw.o
 obj-$(CONFIG_EFI_APP) += serial_efi.o
 obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o
 obj-$(CONFIG_MCFUART) += mcfuart.o

diff --git a/drivers/serial/serial_dw.c b/drivers/serial/serial_dw.c
deleted file mode 100644 (file)
index a348f29..0000000
--- a/drivers/serial/serial_dw.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <ns16550.h>
-#include <serial.h>
-
-static const struct udevice_id dw_serial_ids[] = {
-       { .compatible = "snps,dw-apb-uart" },
-       { }
-};
-
-static int dw_serial_ofdata_to_platdata(struct udevice *dev)
-{
-       struct ns16550_platdata *plat = dev_get_platdata(dev);
-       int ret;
-
-       ret = ns16550_serial_ofdata_to_platdata(dev);
-       if (ret)
-               return ret;
-       plat->clock = CONFIG_SYS_NS16550_CLK;
-
-       return 0;
-}
-
-U_BOOT_DRIVER(serial_ns16550) = {
-       .name   = "serial_dw",
-       .id     = UCLASS_SERIAL,
-       .of_match = dw_serial_ids,
-       .ofdata_to_platdata = dw_serial_ofdata_to_platdata,
-       .platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
-       .priv_auto_alloc_size = sizeof(struct NS16550),
-       .probe = ns16550_serial_probe,
-       .ops    = &ns16550_serial_ops,
-};

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 1ecbd3521f6e6cf8a43cbc5eb69a6a281d8a4251..0e33a890968e3a4d59cb18d4ee63a6649411b713 100644 (file)
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -40,7 +40,7 @@
  * NS16550 Configuration
  */
 #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_SERIAL)
-#define CONFIG_DW_SERIAL
+#define CONFIG_NS16550_SERIAL
 #endif
 
 #define CONFIG_SYS_NS16550

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index d7d5d25c0b7a94a2a1fda81dc22e5aa5d2a806b1..f560219881b8817e6ac5fa01c1064eb9e726442a 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -46,7 +46,7 @@
 /* ns16550 reg in the low bits of cpu reg */
 #define CONFIG_SYS_NS16550_CLK         24000000
 #ifdef CONFIG_DM_SERIAL
-# define CONFIG_DW_SERIAL
+# define CONFIG_NS16550_SERIAL
 #else
 # define CONFIG_SYS_NS16550_REG_SIZE   -4
 # define CONFIG_SYS_NS16550_COM1               SUNXI_UART0_BASE

diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index e3c41ef4bd94a585faeddd9deaa4ac2cb3b219ac..44287d80484daea7ab9b01f57c50f5c650590903 100644 (file)
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -35,7 +35,7 @@
 /*
  * UART configuration
  */
-#define CONFIG_DW_SERIAL
+#define CONFIG_NS16550_SERIAL
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         166666666