77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
From c18ca341da823bd2ec5aa04ea5970d3867eaae73 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <c18ca341da823bd2ec5aa04ea5970d3867eaae73.1605346684.git.stefan@agner.ch>
|
|
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
|
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
|
From: Pascal Vizeli <pvizeli@syshack.ch>
|
|
Date: Tue, 2 Jun 2020 21:20:08 +0000
|
|
Subject: [PATCH 8/8] ARM: dts: bcm283x: add compatible picked up by U-Boot
|
|
|
|
Without brcm,bcm2835-pl011 in compatible U-Boot uses the regular PL011
|
|
driver which seems to crash when enable_uart=1 is not used. Using
|
|
brcm,bcm2835-pl011 works around that and does not affect Linux since its
|
|
not using that compatible string.
|
|
|
|
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
arch/arm/boot/dts/bcm2711.dtsi | 8 ++++----
|
|
arch/arm/boot/dts/bcm283x.dtsi | 2 +-
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
|
|
index 4f87bb4fd3d1..12f0d90e8957 100644
|
|
--- a/arch/arm/boot/dts/bcm2711.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2711.dtsi
|
|
@@ -110,7 +110,7 @@
|
|
};
|
|
|
|
uart2: serial@7e201400 {
|
|
- compatible = "arm,pl011", "arm,primecell";
|
|
+ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
|
|
reg = <0x7e201400 0x200>;
|
|
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clocks BCM2835_CLOCK_UART>,
|
|
@@ -121,7 +121,7 @@
|
|
};
|
|
|
|
uart3: serial@7e201600 {
|
|
- compatible = "arm,pl011", "arm,primecell";
|
|
+ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
|
|
reg = <0x7e201600 0x200>;
|
|
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clocks BCM2835_CLOCK_UART>,
|
|
@@ -132,7 +132,7 @@
|
|
};
|
|
|
|
uart4: serial@7e201800 {
|
|
- compatible = "arm,pl011", "arm,primecell";
|
|
+ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
|
|
reg = <0x7e201800 0x200>;
|
|
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clocks BCM2835_CLOCK_UART>,
|
|
@@ -143,7 +143,7 @@
|
|
};
|
|
|
|
uart5: serial@7e201a00 {
|
|
- compatible = "arm,pl011", "arm,primecell";
|
|
+ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
|
|
reg = <0x7e201a00 0x200>;
|
|
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&clocks BCM2835_CLOCK_UART>,
|
|
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
|
|
index 4426f9e6ba92..abcf677fe416 100644
|
|
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
|
@@ -306,7 +306,7 @@
|
|
};
|
|
|
|
uart0: serial@7e201000 {
|
|
- compatible = "arm,pl011", "arm,primecell";
|
|
+ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
|
|
reg = <0x7e201000 0x200>;
|
|
interrupts = <2 25>;
|
|
clocks = <&clocks BCM2835_CLOCK_UART>,
|
|
--
|
|
2.29.2
|
|
|