From a0cea24c2281aa082845cd162b704fe038bce783 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 30 Jan 2025 16:49:03 +0100 Subject: [PATCH] qualcommbe: ipq95xx: Refresh the NSSCC and PORT patch for new PCIe patches Refresh the NSSCC patch for new PCIe patches. To keep track of fuzz changes for the IPQ95xx patches, patch are not refreshed currently. For the specific case of NSSCC patch, quilt gets confused and apply the patch in the wrong node, putting it in the RPM node (causing all kind of funny errors at runtime) Correctly fix the patch to put the node right after the PCIe nodes. Also the PORT patch need to be refreshed as the gpio header is added by the PCIe patch. Signed-off-by: Christian Marangi --- .../105-06-arm64-dts-qcom-ipq9574-Add-nsscc-node.patch | 7 +++---- ...0-05-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch | 8 +------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/target/linux/qualcommbe/patches-6.6/105-06-arm64-dts-qcom-ipq9574-Add-nsscc-node.patch b/target/linux/qualcommbe/patches-6.6/105-06-arm64-dts-qcom-ipq9574-Add-nsscc-node.patch index bf3f72449f..539f998b00 100644 --- a/target/linux/qualcommbe/patches-6.6/105-06-arm64-dts-qcom-ipq9574-Add-nsscc-node.patch +++ b/target/linux/qualcommbe/patches-6.6/105-06-arm64-dts-qcom-ipq9574-Add-nsscc-node.patch @@ -24,11 +24,10 @@ index 08a82a5cf667..c113fff22f73 100644 #include / { -@@ -756,6 +758,26 @@ frame@b128000 { - status = "disabled"; - }; +@@ -756,6 +758,25 @@ frame@b128000 { + status = "disabled"; }; -+ + + nsscc: clock-controller@39b00000 { + compatible = "qcom,ipq9574-nsscc"; + reg = <0x39b00000 0x80000>; diff --git a/target/linux/qualcommbe/patches-6.6/200-05-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch b/target/linux/qualcommbe/patches-6.6/200-05-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch index 73c0c12493..a79022939d 100644 --- a/target/linux/qualcommbe/patches-6.6/200-05-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch +++ b/target/linux/qualcommbe/patches-6.6/200-05-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch @@ -20,7 +20,7 @@ diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts b/arch/arm64/boot/dts/q index 1bb8d96c9a82..1bbe4c258c15 100644 --- a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts +++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts -@@ -3,11 +3,13 @@ +@@ -3,7 +3,7 @@ * IPQ9574 RDP433 board device tree source * * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved. @@ -29,12 +29,6 @@ index 1bb8d96c9a82..1bbe4c258c15 100644 */ /dts-v1/; - -+#include -+ - #include "ipq9574-rdp-common.dtsi" - - / { @@ -15,6 +15,46 @@ / { compatible = "qcom,ipq9574-ap-al02-c7", "qcom,ipq9574"; }; -- 2.30.2