diff options
| author | Thomas Chou <thomas@wytron.com.tw> | 2015-11-19 21:48:06 +0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-20 20:41:30 -0500 |
| commit | 81cd63a991f87c1ddbf7850beae0a4c543b45c7e (patch) | |
| tree | bd07fcdd6ae2859572a10df3523b73a3a9dadfd4 /drivers/serial | |
| parent | 8e62d32e5ba2e79364f958079cf9f7e2e5a591a1 (diff) | |
| download | u-boot-imx-81cd63a991f87c1ddbf7850beae0a4c543b45c7e.zip u-boot-imx-81cd63a991f87c1ddbf7850beae0a4c543b45c7e.tar.gz u-boot-imx-81cd63a991f87c1ddbf7850beae0a4c543b45c7e.tar.bz2 | |
ns16550: unify serial_x86
Unify serial_x86, and use the generic binding.
Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 1 | ||||
| -rw-r--r-- | drivers/serial/serial_x86.c | 44 |
3 files changed, 1 insertions, 55 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 0f0e92d..93faa4c 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -198,6 +198,7 @@ config ROCKCHIP_SERIAL config NS16550_SERIAL bool "NS16550 UART or compatible" depends on DM_SERIAL + default y if X86 help Support NS16550 UART or compatible with driver model. This can be enabled in the device tree with the correct input clock frequency. @@ -233,14 +234,4 @@ config UNIPHIER_SERIAL If you have a UniPhier based board and want to use the on-chip serial ports, say Y to this option. If unsure, say N. -config X86_SERIAL - bool "Support for 16550 serial port on x86 machines" - depends on X86 - default y - help - Most x86 machines have a ns16550 UART or compatible. This can be - enabled in the device tree with the correct input clock frequency - provided (default 1843200). Enable this to obtain serial console - output. - endmenu diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 1818c7c..9036a8e 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -46,7 +46,6 @@ obj-$(CONFIG_ARC_SERIAL) += serial_arc.o obj-$(CONFIG_TEGRA_SERIAL) += serial_tegra.o obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o obj-$(CONFIG_OMAP_SERIAL) += serial_omap.o -obj-$(CONFIG_X86_SERIAL) += serial_x86.o obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o ifndef CONFIG_SPL_BUILD diff --git a/drivers/serial/serial_x86.c b/drivers/serial/serial_x86.c deleted file mode 100644 index 4bf6062..0000000 --- a/drivers/serial/serial_x86.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <dm.h> -#include <fdtdec.h> -#include <ns16550.h> -#include <serial.h> - -DECLARE_GLOBAL_DATA_PTR; - -static const struct udevice_id x86_serial_ids[] = { - { .compatible = "x86-uart" }, - { } -}; - -static int x86_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 = fdtdec_get_int(gd->fdt_blob, dev->of_offset, - "clock-frequency", 1843200); - - return 0; -} - -U_BOOT_DRIVER(serial_ns16550) = { - .name = "serial_x86", - .id = UCLASS_SERIAL, - .of_match = x86_serial_ids, - .ofdata_to_platdata = x86_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, -}; |