From ace59da1370215a478bce791622cf8913157b9b5 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Thu, 19 Nov 2015 21:48:10 +0800 Subject: [PATCH] ns16550: unify serial_dw Unify serial_dw, and use the generic binding. Signed-off-by: Thomas Chou Reviewed-by: Tom Rini Acked-by: Simon Glass --- drivers/serial/Makefile | 1 - drivers/serial/serial_dw.c | 39 ---------------------------------- include/configs/mv-common.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/tb100.h | 2 +- 5 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 drivers/serial/serial_dw.c diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 1663ca20bb..2a83756354 100644 --- 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 index a348f2956a..0000000000 --- a/drivers/serial/serial_dw.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include - -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 1ecbd3521f..0e33a89096 100644 --- 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 d7d5d25c0b..f560219881 100644 --- 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 e3c41ef4bd..44287d8048 100644 --- 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 -- 2.39.5