From 2ee5b0aa94b16961423dcf5c383034abf3e1c048 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Mon, 3 Jun 2019 22:12:43 +0200 Subject: serial_ns16550: readd support for mvebu armada 38x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Sascha Hauer --- drivers/serial/serial_ns16550.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/serial') diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index ccd082e495..4c84d27bdc 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) { -- cgit v1.2.3