[SRU][focal/linux-raspi][PATCH 2/2] UBUNTU: SAUCE: arm: dts: Add 'brcm, bcm2835-pl011' for compatible for uart2-5

[Juerg Haefliger]

BugLink: https://bugs.launchpad.net/bugs/1875454

This compatible is required for serial output from Focal's u-boot v2019.07
on Pi 4B. Add it until u-boot catches up.

There is a previous commit which fixes uart0 but the uarts 2-5 need this
compatible as well otherwise the Pi 4B won't boot with, for example,
'dtoverlay=uart4'.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 arch/arm/boot/dts/bcm2711.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
index fc08d8777e7c..33139549be36 100644
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -117,7 +117,7 @@
 		};
 
 		uart2: serial at 7e201400 {
-			compatible = "arm,pl011", "arm,primecell";
+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";  /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */
 			reg = <0x7e201400 0x200>;
 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clocks BCM2835_CLOCK_UART>,
@@ -128,7 +128,7 @@
 		};
 
 		uart3: serial at 7e201600 {
-			compatible = "arm,pl011", "arm,primecell";
+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";  /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */
 			reg = <0x7e201600 0x200>;
 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clocks BCM2835_CLOCK_UART>,
@@ -139,7 +139,7 @@
 		};
 
 		uart4: serial at 7e201800 {
-			compatible = "arm,pl011", "arm,primecell";
+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";  /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */
 			reg = <0x7e201800 0x200>;
 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clocks BCM2835_CLOCK_UART>,
@@ -150,7 +150,7 @@
 		};
 
 		uart5: serial at 7e201a00 {
-			compatible = "arm,pl011", "arm,primecell";
+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";  /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */
 			reg = <0x7e201a00 0x200>;
 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clocks BCM2835_CLOCK_UART>,
-- 
2.20.1