| From 6903bf8be2f4dfa8ac97efae70cf13ae326a0d61 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 24 Nov 2021 08:31:09 +0100 |
| Subject: Revert "tty: serial: fsl_lpuart: drop earlycon entry for i.MX8QXP" |
| |
| From: Alexander Stein <alexander.stein@ew.tq-group.com> |
| |
| [ Upstream commit 4e9679738a918d8a482ac6a2cb2bb871f094bb84 ] |
| |
| Revert commit b4b844930f27 ("tty: serial: fsl_lpuart: drop earlycon entry |
| for i.MX8QXP"), because this breaks earlycon support on imx8qm/imx8qxp. |
| While it is true that for earlycon there is no difference between |
| i.MX8QXP and i.MX7ULP (for now at least), there are differences |
| regarding clocks and fixups for wakeup support. For that reason it was |
| deemed unacceptable to add the imx7ulp compatible to device tree in |
| order to get earlycon working again. |
| |
| Reviewed-by: Peng Fan <peng.fan@nxp.com> |
| Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> |
| Link: https://lore.kernel.org/r/20211124073109.805088-1-alexander.stein@ew.tq-group.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/tty/serial/fsl_lpuart.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c |
| index b1e7190ae4836..ac5112def40d1 100644 |
| --- a/drivers/tty/serial/fsl_lpuart.c |
| +++ b/drivers/tty/serial/fsl_lpuart.c |
| @@ -2625,6 +2625,7 @@ OF_EARLYCON_DECLARE(lpuart, "fsl,vf610-lpuart", lpuart_early_console_setup); |
| OF_EARLYCON_DECLARE(lpuart32, "fsl,ls1021a-lpuart", lpuart32_early_console_setup); |
| OF_EARLYCON_DECLARE(lpuart32, "fsl,ls1028a-lpuart", ls1028a_early_console_setup); |
| OF_EARLYCON_DECLARE(lpuart32, "fsl,imx7ulp-lpuart", lpuart32_imx_early_console_setup); |
| +OF_EARLYCON_DECLARE(lpuart32, "fsl,imx8qxp-lpuart", lpuart32_imx_early_console_setup); |
| EARLYCON_DECLARE(lpuart, lpuart_early_console_setup); |
| EARLYCON_DECLARE(lpuart32, lpuart32_early_console_setup); |
| |
| -- |
| 2.33.0 |
| |