am33xx: Update serial pdata
PATCH 1/1 am33xx: Update serial pdata
We now want to make sure that we have the platform data for NS16550 when we do not have OF_CONTROL set.
Signed-off-by Tom Rini <[email protected]>
--- arch/arm/cpu/armv7/am33xx/board.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
arch/arm/cpu/armv7/am33xx/board.c +7 -11
@@ -38,11 +38,7 @@DECLARE_GLOBAL_DATA_PTR ; -#if defined(CONFIG_DM_SERIAL ) && !defined(CONFIG_OF_CONTROL ) -/* -* TODO(sjg at chromium.org): When we can move SPL serial to DM, we can remove -* the CONFIGs. At the same time, we should move this to the board files. -*/ +#if !CONFIG_IS_ENABLED (OF_CONTROL )static const struct ns16550_platdata am33xx_serial[] = { {CONFIG_SYS_NS16550_COM1 ,2 ,CONFIG_SYS_NS16550_CLK }, # ifdef CONFIG_SYS_NS16550_COM2
@@ -57,14 +53,14 @@ static const struct ns16550_platdata am33xx_serial[] = { };U_BOOT_DEVICES (am33xx_uarts) = { - {"serial_omap" , &am33xx_serial[0 ] }, + {"ns16550_serial" , &am33xx_serial[0 ] }, # ifdef CONFIG_SYS_NS16550_COM2 - {"serial_omap" , &am33xx_serial[1 ] }, + {"ns16550_serial" , &am33xx_serial[1 ] }, # ifdef CONFIG_SYS_NS16550_COM3 - {"serial_omap" , &am33xx_serial[2 ] }, - {"serial_omap" , &am33xx_serial[3 ] }, - {"serial_omap" , &am33xx_serial[4 ] }, - {"serial_omap" , &am33xx_serial[5 ] }, + {"ns16550_serial" , &am33xx_serial[2 ] }, + {"ns16550_serial" , &am33xx_serial[3 ] }, + {"ns16550_serial" , &am33xx_serial[4 ] }, + {"ns16550_serial" , &am33xx_serial[5 ] }, # endif # endif };
Signature · 1 line
1.7.9.5
PATCH 1/1 am33xx: Update serial pdata
Hi Tom,
Quoted 8 lines · Tom Rini
We now want to make sure that we have the platform data for NS16550 when we do not have
OF_CONTROLset.Signed-off-by Tom Rini <[email protected]>--- arch/arm/cpu/armv7/am33xx/board.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
Reviewed-by Simon Glass <[email protected]>
...so I won't include this patch. Thanks!
Regards,
Simon
PATCH 1/1 am33xx: Update serial pdata
Quoted 6 lines · Simon Glass
Hi Tom,
Quoted 3 lines · Tom Rini
We now want to make sure that we have the platform data for NS16550 when we do not have
OF_CONTROLset.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Tom Rini <[email protected]>--- arch/arm/cpu/armv7/am33xx/board.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/cebab741/attachment.sig>