LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ns16550: unify serial_omap 

Unify serial_omap, 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:12 +08:00 committed by Tom Rini
parent 1874626b2b
commit c7b9686d5d
18 changed files with 22 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/isee/igep00x0/igep00x0.c
View File

@ -40,7 +40,7 @@ static const struct ns16550_platdata igep_serial = {
}; };
U_BOOT_DEVICE(igep_uart) = { U_BOOT_DEVICE(igep_uart) = {
"serial_omap", "ns16550_serial",
&igep_serial &igep_serial
}; };

2
board/lge/sniper/sniper.c
View File

@ -35,7 +35,7 @@ static const struct ns16550_platdata serial_omap_platdata = {
}; };
U_BOOT_DEVICE(sniper_serial) = { U_BOOT_DEVICE(sniper_serial) = {
.name = "serial_omap", .name = "ns16550_serial",
.platdata = &serial_omap_platdata .platdata = &serial_omap_platdata
}; };

2
board/logicpd/omap3som/omap3logic.c
View File

@ -43,7 +43,7 @@ static const struct ns16550_platdata omap3logic_serial = {
}; };
U_BOOT_DEVICE(omap3logic_uart) = { U_BOOT_DEVICE(omap3logic_uart) = {
"serial_omap", "ns16550_serial",
&omap3logic_serial &omap3logic_serial
}; };

2
board/logicpd/zoom1/zoom1.c
View File

@ -50,7 +50,7 @@ static const struct ns16550_platdata zoom1_serial = {
}; };
U_BOOT_DEVICE(zoom1_uart) = { U_BOOT_DEVICE(zoom1_uart) = {
"serial_omap", "ns16550_serial",
&zoom1_serial &zoom1_serial
}; };

2
board/overo/overo.c
View File

@ -74,7 +74,7 @@ static const struct ns16550_platdata overo_serial = {
}; };
U_BOOT_DEVICE(overo_uart) = { U_BOOT_DEVICE(overo_uart) = {
"serial_omap", "ns16550_serial",
&overo_serial &overo_serial
}; };

2
board/quipos/cairo/cairo.c
View File

@ -97,7 +97,7 @@ static const struct ns16550_platdata cairo_serial = {
}; };
U_BOOT_DEVICE(cairo_uart) = { U_BOOT_DEVICE(cairo_uart) = {
"serial_omap", "ns16550_serial",
&cairo_serial &cairo_serial
}; };

2
board/ti/beagle/beagle.c
View File

@ -79,7 +79,7 @@ static const struct ns16550_platdata beagle_serial = {
}; };
U_BOOT_DEVICE(beagle_uart) = { U_BOOT_DEVICE(beagle_uart) = {
"serial_omap", "ns16550_serial",
&beagle_serial &beagle_serial
}; };

2
board/timll/devkit8000/devkit8000.c
View File

@ -52,7 +52,7 @@ static const struct ns16550_platdata devkit8000_serial = {
}; };
U_BOOT_DEVICE(devkit8000_uart) = { U_BOOT_DEVICE(devkit8000_uart) = {
"serial_omap", "ns16550_serial",
&devkit8000_serial &devkit8000_serial
}; };

1
drivers/serial/Makefile
View File

@ -40,7 +40,6 @@ obj-$(CONFIG_FSL_LPUART) += serial_lpuart.o
obj-$(CONFIG_MXS_AUART) += mxs_auart.o obj-$(CONFIG_MXS_AUART) += mxs_auart.o
obj-$(CONFIG_ARC_SERIAL) += serial_arc.o obj-$(CONFIG_ARC_SERIAL) += serial_arc.o
obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o
obj-$(CONFIG_OMAP_SERIAL) += serial_omap.o
obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD

54
drivers/serial/serial_omap.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 <fdtdec.h>
#include <ns16550.h>
#include <serial.h>
DECLARE_GLOBAL_DATA_PTR;
#define DEFAULT_CLK_SPEED 48000000 /* 48Mhz */
#if CONFIG_IS_ENABLED(OF_CONTROL)
static const struct udevice_id omap_serial_ids[] = {
{ .compatible = "ti,omap2-uart" },
{ .compatible = "ti,omap3-uart" },
{ .compatible = "ti,omap4-uart" },
{ .compatible = "ti,am3352-uart" },
{ .compatible = "ti,am4372-uart" },
{ .compatible = "ti,dra742-uart" },
{ }
};
static int omap_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", DEFAULT_CLK_SPEED);
plat->reg_shift = 2;
return 0;
}
#endif
U_BOOT_DRIVER(serial_omap_ns16550) = {
.name = "serial_omap",
.id = UCLASS_SERIAL,
.of_match = of_match_ptr(omap_serial_ids),
.ofdata_to_platdata = of_match_ptr(omap_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,
.flags = DM_FLAG_PRE_RELOC,
};

4
include/configs/am43xx_evm.h
View File

@ -23,12 +23,12 @@
/* NS16550 Configuration */ /* NS16550 Configuration */
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_CLK 48000000
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) #if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_CLK 48000000
#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_REG_SIZE (-4)
#else #else
#define CONFIG_OMAP_SERIAL #define CONFIG_NS16550_SERIAL
#endif #endif
/* I2C Configuration */ /* I2C Configuration */

2
include/configs/cm_t43.h
View File

@ -18,7 +18,7 @@
#include <asm/arch/omap.h> #include <asm/arch/omap.h>
/* Serial support */ /* Serial support */
#define CONFIG_OMAP_SERIAL #define CONFIG_NS16550_SERIAL
#define CONFIG_DM_SERIAL #define CONFIG_DM_SERIAL
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL

3
include/configs/omap3_pandora.h
View File

@ -49,7 +49,8 @@
/* /*
* NS16550 Configuration * NS16550 Configuration
*/ */
#undef CONFIG_OMAP_SERIAL #undef CONFIG_NS16550_SERIAL
#undef CONFIG_SYS_NS16550_CLK
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK

4
include/configs/sniper.h
View File

@ -197,14 +197,14 @@
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define CONFIG_OMAP_SERIAL #define CONFIG_NS16550_SERIAL
#else #else
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
#endif #endif
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
#define CONFIG_CONS_INDEX 3 #define CONFIG_CONS_INDEX 3
#define CONFIG_SERIAL3 3 #define CONFIG_SERIAL3 3

2
include/configs/ti_am335x_common.h
View File

@ -20,7 +20,7 @@
#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
# define CONFIG_OMAP_SERIAL # define CONFIG_NS16550_SERIAL
#endif #endif
#include <asm/arch/omap.h> #include <asm/arch/omap.h>

4
include/configs/ti_omap3_common.h
View File

@ -19,7 +19,7 @@
#include <asm/arch/omap.h> #include <asm/arch/omap.h>
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
# define CONFIG_OMAP_SERIAL # define CONFIG_NS16550_SERIAL
#endif #endif
/* Common ARM Erratas */ /* Common ARM Erratas */
@ -37,10 +37,10 @@
/* NS16550 Configuration */ /* NS16550 Configuration */
#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
# define CONFIG_SYS_NS16550_SERIAL # define CONFIG_SYS_NS16550_SERIAL
# define CONFIG_SYS_NS16550_REG_SIZE (-4) # define CONFIG_SYS_NS16550_REG_SIZE (-4)
# define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
#endif #endif
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
115200} 115200}

4
include/configs/ti_omap4_common.h
View File

@ -58,13 +58,13 @@
* Hardware drivers * Hardware drivers
*/ */
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_CLK 48000000
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) #if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK 48000000
#define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_SYS_NS16550_COM3 UART3_BASE
#else #else
#define CONFIG_OMAP_SERIAL #define CONFIG_NS16550_SERIAL
#endif #endif
#define CONFIG_CONS_INDEX 3 #define CONFIG_CONS_INDEX 3

4
include/configs/ti_omap5_common.h
View File

@ -51,12 +51,12 @@
* Hardware drivers * Hardware drivers
*/ */
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_CLK 48000000
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) #if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK 48000000
#else #else
#define CONFIG_OMAP_SERIAL #define CONFIG_NS16550_SERIAL
#endif #endif
/* /*