GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 13:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ns16550: unify serial_tegra

Browse source 
Unify serial_tegra, 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>
This commit is contained in:
Thomas Chou 2015-11-19 21:48:11 +08:00 • committed by Tom Rini
parent ace59da137
commit 1874626b2b
4 changed files with 16 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/mach-tegra/board.c
View file

@ -6,6 +6,8 @@
*/
#include <common.h>
#include <dm.h>
#include <ns16550.h>
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
@ -212,6 +214,18 @@ void board_init_uart_f(void)
setup_uarts(uart_ids);
}
#if CONFIG_IS_ENABLED(DM_SERIAL) && !CONFIG_IS_ENABLED(OF_CONTROL)
static struct ns16550_platdata ns16550_com1_pdata = {
.base = CONFIG_SYS_NS16550_COM1,
.reg_shift = 2,
.clock = CONFIG_SYS_NS16550_CLK,
};
U_BOOT_DEVICE(ns16550_com1) = {
"ns16550_serial", &ns16550_com1_pdata
};
#endif
#if !defined(CONFIG_SYS_DCACHE_OFF) && !defined(CONFIG_ARM64)
void enable_caches(void)
{

1
drivers/serial/Makefile
View file

@ -39,7 +39,6 @@ obj-$(CONFIG_BFIN_SERIAL) += serial_bfin.o
obj-$(CONFIG_FSL_LPUART) += serial_lpuart.o
obj-$(CONFIG_MXS_AUART) += mxs_auart.o
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_STM32_SERIAL) += serial_stm32.o

54
drivers/serial/serial_tegra.c
View file

@ -1,54 +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>
#if CONFIG_IS_ENABLED(OF_CONTROL)
static const struct udevice_id tegra_serial_ids[] = {
{ .compatible = "nvidia,tegra20-uart" },
{ }
};
static int tegra_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 = V_NS16550_CLK;
return 0;
}
#else
struct ns16550_platdata tegra_serial = {
.base = CONFIG_SYS_NS16550_COM1,
.reg_shift = 2,
.clock = V_NS16550_CLK,
};
U_BOOT_DEVICE(ns16550_serial) = {
"serial_tegra20", &tegra_serial
};
#endif
U_BOOT_DRIVER(serial_ns16550) = {
.name = "serial_tegra20",
.id = UCLASS_SERIAL,
#if CONFIG_IS_ENABLED(OF_CONTROL)
.of_match = tegra_serial_ids,
.ofdata_to_platdata = tegra_serial_ofdata_to_platdata,
.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
#endif
.priv_auto_alloc_size = sizeof(struct NS16550),
.probe = ns16550_serial_probe,
.ops = &ns16550_serial_ops,
.flags = DM_FLAG_PRE_RELOC,
};

3
include/configs/tegra-common.h
View file

@ -39,8 +39,9 @@
/*
* NS16550 Configuration
*/
#define CONFIG_TEGRA_SERIAL
#define CONFIG_NS16550_SERIAL
#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
/*
* Common HW configuration.