From c7b9686d5d482c8e952598841ea467e6ec0ec0de Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Thu, 19 Nov 2015 21:48:12 +0800 Subject: ns16550: unify serial_omap Unify serial_omap, and use the generic binding. Signed-off-by: Thomas Chou Reviewed-by: Tom Rini Acked-by: Simon Glass --- include/configs/am43xx_evm.h | 4 ++-- include/configs/cm_t43.h | 2 +- include/configs/omap3_pandora.h | 3 ++- include/configs/sniper.h | 4 ++-- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_omap3_common.h | 4 ++-- include/configs/ti_omap4_common.h | 4 ++-- include/configs/ti_omap5_common.h | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 76d4032..1126cdd 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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 */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index c4d3b94..e1019ff 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -18,7 +18,7 @@ #include /* Serial support */ -#define CONFIG_OMAP_SERIAL +#define CONFIG_NS16550_SERIAL #define CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 4e93705..c15c699 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index f168e8f..34f7f6e 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -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 diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 9697431..32348ab 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -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 diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index e399a87..e749d5d 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -19,7 +19,7 @@ #include #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} diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 741f71f..0a03cd5 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -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 diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 5acbc92..be1f4c1 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -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 /* -- cgit v1.1