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:
@@ -23,12 +23,12 @@
|
||||
|
||||
/* NS16550 Configuration */
|
||||
#define CONFIG_SYS_NS16550
|
||||
#define CONFIG_SYS_NS16550_CLK 48000000
|
||||
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
#define CONFIG_SYS_NS16550_CLK 48000000
|
||||
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
|
||||
#else
|
||||
#define CONFIG_OMAP_SERIAL
|
||||
#define CONFIG_NS16550_SERIAL
|
||||
#endif
|
||||
|
||||
/* I2C Configuration */
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <asm/arch/omap.h>
|
||||
|
||||
/* Serial support */
|
||||
#define CONFIG_OMAP_SERIAL
|
||||
#define CONFIG_NS16550_SERIAL
|
||||
#define CONFIG_DM_SERIAL
|
||||
#define CONFIG_SYS_NS16550
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
|
||||
@@ -49,7 +49,8 @@
|
||||
/*
|
||||
* NS16550 Configuration
|
||||
*/
|
||||
#undef CONFIG_OMAP_SERIAL
|
||||
#undef CONFIG_NS16550_SERIAL
|
||||
#undef CONFIG_SYS_NS16550_CLK
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
|
||||
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
|
||||
|
||||
@@ -197,14 +197,14 @@
|
||||
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_OMAP_SERIAL
|
||||
#define CONFIG_NS16550_SERIAL
|
||||
#else
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
|
||||
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_NS16550
|
||||
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
|
||||
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
|
||||
#define CONFIG_CONS_INDEX 3
|
||||
#define CONFIG_SERIAL3 3
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
# define CONFIG_OMAP_SERIAL
|
||||
# define CONFIG_NS16550_SERIAL
|
||||
#endif
|
||||
|
||||
#include <asm/arch/omap.h>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <asm/arch/omap.h>
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
# define CONFIG_OMAP_SERIAL
|
||||
# define CONFIG_NS16550_SERIAL
|
||||
#endif
|
||||
|
||||
/* Common ARM Erratas */
|
||||
@@ -37,10 +37,10 @@
|
||||
/* NS16550 Configuration */
|
||||
#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */
|
||||
#define CONFIG_SYS_NS16550
|
||||
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
# define CONFIG_SYS_NS16550_SERIAL
|
||||
# define CONFIG_SYS_NS16550_REG_SIZE (-4)
|
||||
# define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
|
||||
#endif
|
||||
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
|
||||
115200}
|
||||
|
||||
@@ -58,13 +58,13 @@
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_SYS_NS16550
|
||||
#define CONFIG_SYS_NS16550_CLK 48000000
|
||||
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
|
||||
#define CONFIG_SYS_NS16550_CLK 48000000
|
||||
#define CONFIG_SYS_NS16550_COM3 UART3_BASE
|
||||
#else
|
||||
#define CONFIG_OMAP_SERIAL
|
||||
#define CONFIG_NS16550_SERIAL
|
||||
#endif
|
||||
#define CONFIG_CONS_INDEX 3
|
||||
|
||||
|
||||
@@ -51,12 +51,12 @@
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_SYS_NS16550
|
||||
#define CONFIG_SYS_NS16550_CLK 48000000
|
||||
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
|
||||
#define CONFIG_SYS_NS16550_CLK 48000000
|
||||
#else
|
||||
#define CONFIG_OMAP_SERIAL
|
||||
#define CONFIG_NS16550_SERIAL
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user