mirror of
https://github.com/home-assistant/operating-system.git
synced 2026-04-18 07:56:19 +01:00
8cb16e8982
* RaspberryPi: Update kernel to 6.12.75 - 89050b1059997d38d55462b323b099a6436dc10d Raspberry devs now don't seem to care about updating any of the repositories following a kernel release anymore so the hash for the latest release was determined from the source package of the latest APT release. * Update rpi-firmware * buildroot d9cb724f06...be34a81850 (1): > package/rpi-firmware: update to eb3ee43 (for 6.12.75) * Add patch fixing serial in U-Boot, refresh patches Change in DTS includes shadowed previous patch adding U-Boot-specific compatible string for UARTs. Make sure that AMBA UARTs in device trees also contain compatibles consumed by U-Boot as fallback. Also, refresh RPi patches with --zero-commit.
71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Pascal Vizeli <pvizeli@syshack.ch>
|
|
Date: Tue, 2 Jun 2020 21:20:08 +0000
|
|
Subject: [PATCH] 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/broadcom/bcm2711.dtsi | 8 ++++----
|
|
arch/arm/boot/dts/broadcom/bcm283x.dtsi | 2 +-
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
|
|
index bb137d8da1a82..cd03157437780 100644
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
|
|
@@ -128,7 +128,7 @@ rng@7e104000 {
|
|
};
|
|
|
|
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>,
|
|
@@ -139,7 +139,7 @@ uart2: serial@7e201400 {
|
|
};
|
|
|
|
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>,
|
|
@@ -150,7 +150,7 @@ uart3: serial@7e201600 {
|
|
};
|
|
|
|
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>,
|
|
@@ -161,7 +161,7 @@ uart4: serial@7e201800 {
|
|
};
|
|
|
|
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/broadcom/bcm283x.dtsi b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
|
|
index 562c4e9d08cc0..d10e441b0df53 100644
|
|
--- a/arch/arm/boot/dts/broadcom/bcm283x.dtsi
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
|
|
@@ -302,7 +302,7 @@ uart1_ctsrts_gpio42: uart1-ctsrts-gpio42 {
|
|
};
|
|
|
|
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>,
|