f5ff224358
* Bump Raspberry Pi kernel to 5.4 Bump kernel to the downstream Raspberry Pi 5.4 kernel. Drop patches already merged upstream and use rebased patches for USB reset controller (required for U-Boot 2020.10 for USB SSD boot). * Add compatible node for upstream U-Boot Add brcm,bcm2835-pl011 to make upstream U-Boot bind with the bcm283x_pl011 driver. This allows to boot with the device tree provided by the Raspberry Pi Linux kernel 5.4 even without enable_uart=1.
61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
From e0231cd65d8c13be1cebae1e6b5fbef61be6be0d Mon Sep 17 00:00:00 2001
|
|
Message-Id: <e0231cd65d8c13be1cebae1e6b5fbef61be6be0d.1604762912.git.stefan@agner.ch>
|
|
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch>
|
|
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1604762912.git.stefan@agner.ch>
|
|
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Date: Mon, 29 Jun 2020 18:18:40 +0200
|
|
Subject: [PATCH 6/8] ARM: dts: bcm2711: Add reset controller to xHCI node
|
|
|
|
The chip is hardwired to the board's PCIe bus and needs to be properly
|
|
setup trough a firmware routine after a PCI fundamental reset. Pass the
|
|
reset controller phandle that takes care of triggering the
|
|
initialization to the relevant PCI device.
|
|
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Link: https://lore.kernel.org/r/20200629161845.6021-5-nsaenzjulienne@suse.de
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit 258f92d2f840b6ea62c0b33f04eb4d9270935bba)
|
|
---
|
|
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 17 +++++++++++++++++
|
|
1 file changed, 17 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
|
index d77d61d41bbc..513cae21e64c 100644
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
|
@@ -3,6 +3,8 @@
|
|
#include "bcm2711.dtsi"
|
|
#include "bcm2835-rpi.dtsi"
|
|
|
|
+#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
|
|
+
|
|
/ {
|
|
compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
|
|
model = "Raspberry Pi 4 Model B";
|
|
@@ -195,6 +197,21 @@
|
|
};
|
|
};
|
|
|
|
+&pcie0 {
|
|
+ pci@1,0 {
|
|
+ #address-cells = <3>;
|
|
+ #size-cells = <2>;
|
|
+ ranges;
|
|
+
|
|
+ reg = <0 0 0 0 0>;
|
|
+
|
|
+ usb@1,0 {
|
|
+ reg = <0x10000 0 0 0 0>;
|
|
+ resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
/* uart0 communicates with the BT module */
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
--
|
|
2.29.1
|
|
|