diff mbox series

[SRU,focal/linux-raspi,1/2] UBUNTU: SAUCE: arm: dts: Clarify the need for "brcm, bcm2835-<foo>"

Message ID 20200624161035.25871-2-juergh@canonical.com
State New
Headers show
Series LP: #1875454 - dtoverlay=uart4 breaks Raspberry Pi 4B boot | expand

Commit Message

Juerg Haefliger June 24, 2020, 4:10 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1875454

Ignore: yes
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 arch/arm/boot/dts/bcm2711.dtsi | 2 +-
 arch/arm/boot/dts/bcm283x.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
index 8e6354fd383f..fc08d8777e7c 100644
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -525,7 +525,7 @@ 
 };
 
 &gpio {
-	compatible = "brcm,bcm2711-gpio", "brcm,bcm2835-gpio";
+	compatible = "brcm,bcm2711-gpio", "brcm,bcm2835-gpio";  /* UBUNTU: "brcm,bcm2835-gpio" is required for u-boot 2019.07 */
 	interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
 		     <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
 		     <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index abcf677fe416..4ac314a2066d 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -306,7 +306,7 @@ 
 		};
 
 		uart0: serial@7e201000 {
-			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";  /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */
 			reg = <0x7e201000 0x200>;
 			interrupts = <2 25>;
 			clocks = <&clocks BCM2835_CLOCK_UART>,