From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 19 Mar 2026 12:33:59 +0100 Subject: [PATCH] ARM: dts: add fallback compatibles for RPi PL011 UARTs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In e165d4f5e96603d19a08983576e61cf09d42bac3 the compatibles for the PL011 UARTs were changed to downstream pl011-axi string, overriding the list of compatibles from upper DTS, used especially by U-Boot. Extend the list with the extra compatibles indicated previously, allowing U-Boot to use the desired driver while keeping the benefits of the PL011 platform driver in Linux. Signed-off-by: Jan Čermák --- arch/arm/boot/dts/broadcom/bcm270x.dtsi | 2 +- arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi | 10 +++++----- arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm270x.dtsi b/arch/arm/boot/dts/broadcom/bcm270x.dtsi index ccc203e3131fa..dcbe0ca57d286 100644 --- a/arch/arm/boot/dts/broadcom/bcm270x.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm270x.dtsi @@ -239,7 +239,7 @@ dpi_16bit_cpadhi_gpio2: dpi_16bit_cpadhi_gpio2 { }; &uart0 { - compatible = "arm,pl011-axi"; + compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; /* Enable CTS bug workaround */ cts-event-workaround; }; diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi index 8cc1ef5bf6d0c..c9429e7cb86bf 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi @@ -510,29 +510,29 @@ &spi6 { }; &uart0 { - compatible = "arm,pl011-axi"; + compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; }; &uart2 { - compatible = "arm,pl011-axi"; + compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; pinctrl-0 = <&uart2_pins>; pinctrl-names = "default"; }; &uart3 { - compatible = "arm,pl011-axi"; + compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; pinctrl-0 = <&uart3_pins>; pinctrl-names = "default"; }; &uart4 { - compatible = "arm,pl011-axi"; + compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; pinctrl-0 = <&uart4_pins>; pinctrl-names = "default"; }; &uart5 { - compatible = "arm,pl011-axi"; + compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; pinctrl-0 = <&uart5_pins>; pinctrl-names = "default"; }; diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi index 98b0e9452e367..f03b4c2bf66b4 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi @@ -430,7 +430,7 @@ &gicv2 { }; &uart10 { - compatible = "arm,pl011-axi"; + compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; }; &aon_intr {