summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2019-06-03 22:12:43 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-06-07 08:42:05 +0200
commit2ee5b0aa94b16961423dcf5c383034abf3e1c048 (patch)
treeb49db8708b973a94e97b222951d808c36832915b
parent58390878bc30382b42145633b2ce8892a6b36165 (diff)
serial_ns16550: readd support for mvebu armada 38x
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> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/serial/serial_ns16550.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index ccd082e..4c84d27 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)
{