From: Álvaro Fernández Rojas Date: Wed, 19 Jun 2024 18:17:44 +0000 (+0200) Subject: bcm27xx: fix malformed upstream arm64 DT patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0a07a3a13dae4a59808359341493416f3653dcce;p=openwrt%2Fstaging%2Fjow.git bcm27xx: fix malformed upstream arm64 DT patch This patch was causing buildbot issues when copying arm64 DT files since bcm283x-rpi-csi1-2lane.dtsi and bcm283x-rpi-lan7515.dtsi were linked to "../../../../arm/boot/dts/" instead of "../../../../arm/boot/dts/broadcom". These files aren't needed, so let's remove them instead of fixing them. Signed-off-by: Álvaro Fernández Rojas Link: https://github.com/openwrt/openwrt/pull/15762 Signed-off-by: Christian Marangi --- diff --git a/target/linux/bcm27xx/patches-6.6/950-0040-BCM2708-Add-core-Device-Tree-support.patch b/target/linux/bcm27xx/patches-6.6/950-0040-BCM2708-Add-core-Device-Tree-support.patch index 0d6895d4f6..3d1e2b2ede 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0040-BCM2708-Add-core-Device-Tree-support.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0040-BCM2708-Add-core-Device-Tree-support.patch @@ -558,8 +558,6 @@ Signed-off-by: Phil Elwell .../boot/dts/broadcom/bcm2710-rpi-zero-2.dts | 1 + .../boot/dts/broadcom/bcm2711-rpi-cm4.dts | 1 + .../boot/dts/broadcom/bcm2711-rpi-cm4s.dts | 1 + - .../dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi | 1 + - .../dts/broadcom/bcm283x-rpi-lan7515.dtsi | 1 + arch/arm64/boot/dts/overlays | 1 + include/dt-bindings/gpio/gpio-fsm.h | 21 + scripts/Makefile.dtbinst | 5 +- @@ -910,8 +908,6 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts - create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi - create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi create mode 120000 arch/arm64/boot/dts/overlays create mode 100644 include/dt-bindings/gpio/gpio-fsm.h @@ -38522,22 +38518,6 @@ index 000000000000..c72d752e7400 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2711-rpi-cm4s.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi -new file mode 120000 -index 000000000000..e5c400284467 ---- /dev/null -+++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi -@@ -0,0 +1 @@ -+../../../../arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi -\ No newline at end of file -diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi -new file mode 120000 -index 000000000000..fc4c05bbe7fd ---- /dev/null -+++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi -@@ -0,0 +1 @@ -+../../../../arm/boot/dts/bcm283x-rpi-lan7515.dtsi -\ No newline at end of file diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays new file mode 120000 index 000000000000..ded08646b6f6