mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From e4659a469e5d96eba2af3a626b3c91898fb50f3a Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Thu, 2 Nov 2023 10:39:11 +0000
|
|
Subject: [PATCH 0703/1085] dts: bcm2712-rpi-5-b: Create some dummy nodes
|
|
|
|
The kernel now treats multiple fragments targeting the same node as an
|
|
error. For this reason, it is important that labels created just for
|
|
compatibility with other systems (e.g. i2c0if and i2c0mux) are
|
|
attached to unique nodes, not just tacked onto existing nodes.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts
|
|
@@ -157,6 +157,12 @@
|
|
dummy: dummy {
|
|
// A target for unwanted overlay fragments
|
|
};
|
|
+
|
|
+
|
|
+ // A few extra labels to keep overlays happy
|
|
+
|
|
+ i2c0if: i2c0if {};
|
|
+ i2c0mux: i2c0mux {};
|
|
};
|
|
|
|
rp1_target: &pcie2 {
|
|
@@ -243,11 +249,6 @@ aux: &dummy {};
|
|
|
|
#include "bcm2712-rpi.dtsi"
|
|
|
|
-// A few extra labels to keep overlays happy
|
|
-
|
|
-i2c0if: &rp1_gpio {};
|
|
-i2c0mux: &rp1_gpio {};
|
|
-
|
|
i2c_csi_dsi0: &i2c6 { // Note: This is for MIPI0 connector only
|
|
pinctrl-0 = <&rp1_i2c6_38_39>;
|
|
pinctrl-names = "default";
|