[PATCH v2 1/1] arm64: dts: lx2160a: Fix the compatible string of LX2160A UART

[Leo Li]

> -----Original Message-----
> From: Zhen Lei <thunder.leizhen at huawei.com>
> Sent: Tuesday, June 15, 2021 8:16 AM
> To: Shawn Guo <shawnguo at kernel.org>; Leo Li <leoyang.li at nxp.com>; Rob
> Herring <robh+dt at kernel.org>; Mark Kettenis <mark.kettenis at xs4all.nl>;
> devicetree <devicetree at vger.kernel.org>; linux-arm-kernel <linux-arm-
> kernel at lists.infradead.org>; linux-kernel <linux-kernel at vger.kernel.org>
> Cc: Zhen Lei <thunder.leizhen at huawei.com>
> Subject: [PATCH v2 1/1] arm64: dts: lx2160a: Fix the compatible string of
> LX2160A UART
> 
> Mark Kettenis told us that:
> According to the NXP documentation, the LX2160A has a real PL011 UART.
> 
> Therefore, rewrite it to the compatible string of pl011. The property "current-
> speed" specific to "arm,sbsa-uart" is also deleted.

Sorry that I missed the discussion on the v1.  But looks like this change breaks the LX2160 boot.  The AMBA matching doesn't seem to work.  And the console is not registered correctly.

[    0.639055] OF: amba_device_add() failed (-2) for /soc/serial at 21c0000
[    0.645612] OF: amba_device_add() failed (-2) for /soc/serial at 21d0000

> 
> Suggested-by: Shawn Guo <shawnguo at kernel.org>
> Suggested-by: Mark Kettenis <mark.kettenis at xs4all.nl>
> Signed-off-by: Zhen Lei <thunder.leizhen at huawei.com>
> ---
>  arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> index c4b1a59ba424..d2e6f7285674 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> @@ -920,34 +920,30 @@ QORIQ_CLK_PLL_DIV(8)>,
>  		};
> 
>  		uart0: serial at 21c0000 {
> -			compatible = "arm,sbsa-uart","arm,pl011";
> +			compatible = "arm,pl011", "arm,primecell";
>  			reg = <0x0 0x21c0000 0x0 0x1000>;
>  			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
> -			current-speed = <115200>;
>  			status = "disabled";
>  		};
> 
>  		uart1: serial at 21d0000 {
> -			compatible = "arm,sbsa-uart","arm,pl011";
> +			compatible = "arm,pl011", "arm,primecell";
>  			reg = <0x0 0x21d0000 0x0 0x1000>;
>  			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
> -			current-speed = <115200>;
>  			status = "disabled";
>  		};
> 
>  		uart2: serial at 21e0000 {
> -			compatible = "arm,sbsa-uart","arm,pl011";
> +			compatible = "arm,pl011", "arm,primecell";
>  			reg = <0x0 0x21e0000 0x0 0x1000>;
>  			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
> -			current-speed = <115200>;
>  			status = "disabled";
>  		};
> 
>  		uart3: serial at 21f0000 {
> -			compatible = "arm,sbsa-uart","arm,pl011";
> +			compatible = "arm,pl011", "arm,primecell";
>  			reg = <0x0 0x21f0000 0x0 0x1000>;
>  			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
> -			current-speed = <115200>;
>  			status = "disabled";
>  		};
> 
> --
> 2.25.1
>