ARM: Various: Future-proof serial platdata
A few boards still use ns16550_platdata structures, but assume the structure is going to be in a specific order. By explicitly naming each entry, this should also help 'future-proof' in the event the structure changes. Tested on the Logic PD Torpedo + Wireless. I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods and Alexander Graf. Signed-off-by: Adam Ford <aford173@gmail.com> V6: Add fix to arch/arm/cpu/armv7/am33xx/board.c V5: Add fix to arch/arm/cpu/arm926ejs/lpc32xx/devices.c V4: Fix subject heading V3: Remove reg_offset out in all the structs. It was reverted out, and and if it did exist, it would get initialized to 0 by default. V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1. Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>utp
Adam Ford
Tom Rini
parent
e850ed82bc
commit
2f6ed3b89a
|
|
@ -45,10 +45,10 @@ void lpc32xx_uart_init(unsigned int uart_id)
|
|||
|
||||
#if !CONFIG_IS_ENABLED(OF_CONTROL)
|
||||
static const struct ns16550_platdata lpc32xx_uart[] = {
|
||||
{ UART3_BASE, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ UART4_BASE, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ UART5_BASE, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ UART6_BASE, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = UART3_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = UART4_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = UART5_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = UART6_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
};
|
||||
|
||||
#if defined(CONFIG_LPC32XX_HSUART)
|
||||
|
|
|
|||
|
|
@ -40,14 +40,14 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
|
||||
#if !CONFIG_IS_ENABLED(OF_CONTROL)
|
||||
static const struct ns16550_platdata am33xx_serial[] = {
|
||||
{ CONFIG_SYS_NS16550_COM1, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
# ifdef CONFIG_SYS_NS16550_COM2
|
||||
{ CONFIG_SYS_NS16550_COM2, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = CONFIG_SYS_NS16550_COM2, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
# ifdef CONFIG_SYS_NS16550_COM3
|
||||
{ CONFIG_SYS_NS16550_COM3, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ CONFIG_SYS_NS16550_COM4, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ CONFIG_SYS_NS16550_COM5, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ CONFIG_SYS_NS16550_COM6, 2, CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = CONFIG_SYS_NS16550_COM3, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = CONFIG_SYS_NS16550_COM4, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = CONFIG_SYS_NS16550_COM5, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
{ .base = CONFIG_SYS_NS16550_COM6, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
|
||||
# endif
|
||||
# endif
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@ static const u32 gpmc_lan_config[] = {
|
|||
#endif
|
||||
|
||||
static const struct ns16550_platdata igep_serial = {
|
||||
OMAP34XX_UART3,
|
||||
2,
|
||||
V_NS16550_CLK
|
||||
.base = OMAP34XX_UART3,
|
||||
.reg_shift = 2,
|
||||
.clock = V_NS16550_CLK
|
||||
};
|
||||
|
||||
U_BOOT_DEVICE(igep_uart) = {
|
||||
|
|
|
|||
|
|
@ -47,9 +47,9 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
*/
|
||||
|
||||
static const struct ns16550_platdata omap3logic_serial = {
|
||||
OMAP34XX_UART1,
|
||||
2,
|
||||
V_NS16550_CLK
|
||||
.base = OMAP34XX_UART1,
|
||||
.reg_shift = 2,
|
||||
.clock = V_NS16550_CLK
|
||||
};
|
||||
|
||||
U_BOOT_DEVICE(omap3logic_uart) = {
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ static const u32 gpmc_lab_enet[] = {
|
|||
};
|
||||
|
||||
static const struct ns16550_platdata zoom1_serial = {
|
||||
OMAP34XX_UART3,
|
||||
2,
|
||||
V_NS16550_CLK
|
||||
.base = OMAP34XX_UART3,
|
||||
.reg_shift = 2,
|
||||
.clock = V_NS16550_CLK
|
||||
};
|
||||
|
||||
U_BOOT_DEVICE(zoom1_uart) = {
|
||||
|
|
|
|||
|
|
@ -68,9 +68,9 @@ static struct {
|
|||
} expansion_config = {0x0};
|
||||
|
||||
static const struct ns16550_platdata overo_serial = {
|
||||
OMAP34XX_UART3,
|
||||
2,
|
||||
V_NS16550_CLK
|
||||
.base = OMAP34XX_UART3,
|
||||
.reg_shift = 2,
|
||||
.clock = V_NS16550_CLK
|
||||
};
|
||||
|
||||
U_BOOT_DEVICE(overo_uart) = {
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
|
|||
#endif
|
||||
|
||||
static const struct ns16550_platdata cairo_serial = {
|
||||
OMAP34XX_UART2,
|
||||
2,
|
||||
V_NS16550_CLK
|
||||
.base = OMAP34XX_UART2,
|
||||
.reg_shift = 2,
|
||||
.clock = V_NS16550_CLK
|
||||
};
|
||||
|
||||
U_BOOT_DEVICE(cairo_uart) = {
|
||||
|
|
|
|||
|
|
@ -73,9 +73,9 @@ static struct {
|
|||
} expansion_config;
|
||||
|
||||
static const struct ns16550_platdata beagle_serial = {
|
||||
OMAP34XX_UART3,
|
||||
2,
|
||||
V_NS16550_CLK
|
||||
.base = OMAP34XX_UART3,
|
||||
.reg_shift = 2,
|
||||
.clock = V_NS16550_CLK
|
||||
};
|
||||
|
||||
U_BOOT_DEVICE(beagle_uart) = {
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
|
|||
};
|
||||
|
||||
static const struct ns16550_platdata devkit8000_serial = {
|
||||
OMAP34XX_UART3,
|
||||
2,
|
||||
V_NS16550_CLK
|
||||
.base = OMAP34XX_UART3,
|
||||
.reg_shift = 2,
|
||||
.clock = V_NS16550_CLK
|
||||
};
|
||||
|
||||
U_BOOT_DEVICE(devkit8000_uart) = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue