From c9abfe8f5ac83e69201d0e5d36799c21ed85842c Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Tue, 17 Mar 2026 14:22:10 +0000
Subject: [PATCH] fixup! ARM: dts: Select the PL011 platform driver

Retain the original compatible strings as fallbacks.

See: https://github.com/raspberrypi/linux/pull/7023

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
 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(-)

--- a/arch/arm/boot/dts/broadcom/bcm270x.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm270x.dtsi
@@ -239,7 +239,7 @@
 };
 
 &uart0 {
-	compatible = "arm,pl011-axi";
+	compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
 	/* Enable CTS bug workaround */
 	cts-event-workaround;
 };
--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
@@ -509,29 +509,29 @@ i2c_vc: &i2c0 {};
 };
 
 &uart0 {
-	compatible = "arm,pl011-axi";
+	compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
 };
 
 &uart2 {
-	compatible = "arm,pl011-axi";
+	compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
 	pinctrl-0 = <&uart2_pins>;
 	pinctrl-names = "default";
 };
 
 &uart3 {
-	compatible = "arm,pl011-axi";
+	compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
 	pinctrl-0 = <&uart3_pins>;
 	pinctrl-names = "default";
 };
 
 &uart4 {
-	compatible = "arm,pl011-axi";
+	compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
 	pinctrl-0 = <&uart4_pins>;
 	pinctrl-names = "default";
 };
 
 &uart5 {
-	compatible = "arm,pl011-axi";
+	compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
 	pinctrl-0 = <&uart5_pins>;
 	pinctrl-names = "default";
 };
--- a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
@@ -411,7 +411,7 @@
 };
 
 &uart10 {
-	compatible = "arm,pl011-axi";
+	compatible = "arm,pl011-axi", "arm,pl011", "arm,primecell";
 };
 
 &aon_intr {
