[PATCH] serial_ns16550: readd support for mvebu armada 38x

[PATCH] serial_ns16550: readd support for mvebu armada 38x

[Uwe Kleine-König]

The armada 38x device tree traditionally used "snps,dw-apb-uart" as
compatible for the internal UARTs. This was changed in Linux by commit
b7639b0b15dd ("serial: 8250_dw: Limit dw8250_tx_wait_empty quirk to
armada-38x devices") which was imported into barebox in e4067b75fb6c
("dts: update to v4.18-rc1") to "marvell,armada-38x-uart".

Teach the driver about the new compatible to make the console work
again.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/serial/serial_ns16550.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index ccd082e495c3..4c84d27bdc1b 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -525,6 +525,9 @@ static struct of_device_id ns16550_serial_dt_ids[] = {
 	}, {
 		.compatible = "snps,dw-apb-uart",
 		.data = &ns16550_drvdata,
+	}, {
+		.compatible = "marvell,armada-38x-uart",
+		.data = &ns16550_drvdata,
 	},
 #if IS_ENABLED(CONFIG_ARCH_OMAP)
 	{
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] serial_ns16550: readd support for mvebu armada 38x

[Sascha Hauer]

On Mon, Jun 03, 2019 at 10:12:43PM +0200, Uwe Kleine-König wrote:
> The armada 38x device tree traditionally used "snps,dw-apb-uart" as
> compatible for the internal UARTs. This was changed in Linux by commit
> b7639b0b15dd ("serial: 8250_dw: Limit dw8250_tx_wait_empty quirk to
> armada-38x devices") which was imported into barebox in e4067b75fb6c
> ("dts: update to v4.18-rc1") to "marvell,armada-38x-uart".
> 
> Teach the driver about the new compatible to make the console work
> again.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/serial/serial_ns16550.c | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
> index ccd082e495c3..4c84d27bdc1b 100644
> --- a/drivers/serial/serial_ns16550.c
> +++ b/drivers/serial/serial_ns16550.c
> @@ -525,6 +525,9 @@ static struct of_device_id ns16550_serial_dt_ids[] = {
>  	}, {
>  		.compatible = "snps,dw-apb-uart",
>  		.data = &ns16550_drvdata,
> +	}, {
> +		.compatible = "marvell,armada-38x-uart",
> +		.data = &ns16550_drvdata,
>  	},
>  #if IS_ENABLED(CONFIG_ARCH_OMAP)
>  	{
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox