]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
qualcommax: ipq50xx: backport upstreamed patch for adding ipq5018 tsens node
authorGeorge Moussalem <george.moussalem@outlook.com>
Fri, 15 Aug 2025 05:30:40 +0000 (09:30 +0400)
committerRobert Marko <robimarko@gmail.com>
Mon, 15 Sep 2025 08:29:41 +0000 (10:29 +0200)
Use upstreamed patch for adding the tsens node.

Temperature sensors are enabled by default, therefore remove explicit
enablement in board files.

Signed-off-by: George Moussalem <george.moussalem@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19890
Signed-off-by: Robert Marko <robimarko@gmail.com>
20 files changed:
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax830.dts
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wn-dax3000gr.dts
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wrc-x3000gs2.dts
target/linux/qualcommax/patches-6.12/0054-v6.18-arm64-dts-qcom-ipq5018-Add-tsens-node.patch [moved from target/linux/qualcommax/patches-6.12/0150-arm64-dts-qcom-ipq5018-Add-tsens-node.patch with 62% similarity]
target/linux/qualcommax/patches-6.12/0180-arm64-dts-qcom-ipq5018-Remove-tsens-v1-fallback-compatible.patch [new file with mode: 0644]
target/linux/qualcommax/patches-6.12/0306-arm64-dts-qcom-ipq5018-Add-PWM-node.patch
target/linux/qualcommax/patches-6.12/0324-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch
target/linux/qualcommax/patches-6.12/0337-arm64-dts-qcom-ipq5018-Add-PRNG-node.patch
target/linux/qualcommax/patches-6.12/0339-arm64-dts-qcom-ipq5018-Add-QUP1-UART2-node.patch
target/linux/qualcommax/patches-6.12/0340-arm64-dts-qcom-ipq5018-Add-QUP3-I2C-node.patch
target/linux/qualcommax/patches-6.12/0421-arm64-dts-qcom-ipq5018-Add-SPI-nand-node.patch
target/linux/qualcommax/patches-6.12/0704-arm64-dts-qcom-ipq5018-Add-ethernet-cmn-node.patch
target/linux/qualcommax/patches-6.12/0713-arm64-dts-qcom-ipq5018-add-mdio-buses.patch
target/linux/qualcommax/patches-6.12/0714-arm64-dts-qcom-ipq5018-add-ge-phy-to-internal-mdio-bus.patch
target/linux/qualcommax/patches-6.12/0715-arm64-dts-qcom-ipq5018-add-vendor-compatible-to-mdio-node.patch
target/linux/qualcommax/patches-6.12/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch
target/linux/qualcommax/patches-6.12/0817-arm64-dts-qcom-ipq5018-add-tz_apps-reserved-memory-region.patch

index 1d2e4f0e859e94f66b5e9add8083a3edd131cfe0..93898d88e0aaaf0e4baed2a260fce7b76387ded8 100644 (file)
        };
 };
 
-&tsens {
-       status = "okay";
-};
-
 &pcie0_phy {
        status = "okay";
 };
index 3eab1749336a2eefc50b2b487b021ebfcea2e8cf..2853c84c4672034d89243f81cbc57b300bb1882b 100644 (file)
        };
 };
 
-&tsens {
-       status = "okay";
-};
-
 &q6v5_wcss {
        status = "okay";
 
index 1e60ed8c97557d66d890eba85fa3f2186ba8dd57..30fce130bf969884d76412cd841137aef461fd45 100644 (file)
        };
 };
 
-&tsens {
-       status = "okay";
-};
-
 &q6v5_wcss {
        status = "okay";
 
index 0cc70cceb7c9ebd2cb97a679c297632b9708f1ca..29754b1e03c5f8acfc1e48cbf7124b682ebeb866 100644 (file)
                bias-disable;
        };
 };
-
-&tsens {
-       status = "okay";
-};
index 39df85f0b70375a04678256896aa0544e1abf869..572f2fbcb28162ae46a5abd9de0b6c02f836b304 100644 (file)
        };
 };
 
-&tsens {
-       status = "okay";
-};
-
 &q6v5_wcss {
        status = "okay";
 
index fc3e86b8702ea8bb6dcc52111ea88e94548d87c0..3e01b8dbd14a76ac3bb93ae45c7151823374fda4 100644 (file)
        };
 };
 
-&tsens {
-       status = "okay";
-};
-
 /*
  * ath11k Wi-Fi consumes too large memory spaces and too few spaces are
  * available for users. To prevent OOM when using LuCI or other softwares,
similarity index 62%
rename from target/linux/qualcommax/patches-6.12/0150-arm64-dts-qcom-ipq5018-Add-tsens-node.patch
rename to target/linux/qualcommax/patches-6.12/0054-v6.18-arm64-dts-qcom-ipq5018-Add-tsens-node.patch
index bed9a1dc009f064b6a0fc04124bb3b3ee3674db0..81e9302bd877d570c12b209490e5d7edca3a31c7 100644 (file)
@@ -1,24 +1,55 @@
-From: George Moussalem <george.moussalem@outlook.com>
-Date: Fri, 28 Feb 2025 09:11:39 +0400
-Subject: [PATCH v9 6/6] arm64: dts: qcom: ipq5018: Add tsens node
-
+From 450a80623e3b8bb5dae59e0d56046fc3d0a88f3b Mon Sep 17 00:00:00 2001
 From: Sricharan Ramabadhran <quic_srichara@quicinc.com>
+Date: Thu, 12 Jun 2025 10:46:14 +0400
+Subject: arm64: dts: qcom: ipq5018: Add tsens node
 
 IPQ5018 has tsens V1.0 IP with 5 sensors, though 4 are in use.
 There is no RPM, so tsens has to be manually enabled. Adding the tsens
-and nvmem nodes and adding 4 thermal sensors (zones). With the
-critical temperature being 120'C and action is to reboot.
+and nvmem nodes and adding 4 thermal sensors (zones). The critical trip
+temperature is set to 120'C with an action to reboot.
+
+In addition, adding a cooling device to the CPU thermal zone which uses
+CPU frequency scaling.
 
 Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
 Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
 Signed-off-by: George Moussalem <george.moussalem@outlook.com>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+[bjorn: Added tsens-v1 fallback compatible, per binding]
+Link: https://lore.kernel.org/r/20250612-ipq5018-tsens-v13-2-a210f3683240@outlook.com
 ---
- arch/arm64/boot/dts/qcom/ipq5018.dtsi | 169 ++++++++++++++++++++++++++
- 1 file changed, 169 insertions(+)
+ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 178 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 178 insertions(+)
+
+(limited to 'arch/arm64/boot/dts/qcom/ipq5018.dtsi')
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -182,6 +182,117 @@
+@@ -9,6 +9,7 @@
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/qcom,gcc-ipq5018.h>
+ #include <dt-bindings/reset/qcom,gcc-ipq5018.h>
++#include <dt-bindings/thermal/thermal.h>
+ / {
+       interrupt-parent = <&intc>;
+@@ -39,6 +40,7 @@
+                       next-level-cache = <&l2_0>;
+                       clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
+                       operating-points-v2 = <&cpu_opp_table>;
++                      #cooling-cells = <2>;
+               };
+               cpu1: cpu@1 {
+@@ -49,6 +51,7 @@
+                       next-level-cache = <&l2_0>;
+                       clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
+                       operating-points-v2 = <&cpu_opp_table>;
++                      #cooling-cells = <2>;
+               };
+               l2_0: l2-cache {
+@@ -182,6 +185,117 @@
                        status = "disabled";
                };
  
@@ -95,9 +126,9 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +              };
 +
 +              tsens: thermal-sensor@4a9000 {
-+                      compatible = "qcom,ipq5018-tsens";
-+                      reg = <0x004a9000 0x1000>, /* TM */
-+                            <0x004a8000 0x1000>; /* SROT */
++                      compatible = "qcom,ipq5018-tsens", "qcom,tsens-v1";
++                      reg = <0x004a9000 0x1000>,
++                            <0x004a8000 0x1000>;
 +
 +                      nvmem-cells = <&tsens_mode>,
 +                                    <&tsens_base1>,
@@ -136,63 +167,69 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
                tlmm: pinctrl@1000000 {
                        compatible = "qcom,ipq5018-tlmm";
                        reg = <0x01000000 0x300000>;
-@@ -630,6 +741,64 @@
+@@ -630,6 +744,70 @@
                        };
                };
        };
 +
 +      thermal-zones {
 +              cpu-thermal {
-+                      polling-delay-passive = <0>;
-+                      polling-delay = <0>;
 +                      thermal-sensors = <&tsens 2>;
 +
 +                      trips {
 +                              cpu-critical {
 +                                      temperature = <120000>;
-+                                      hysteresis = <2>;
++                                      hysteresis = <1000>;
 +                                      type = "critical";
 +                              };
++
++                              cpu_alert: cpu-passive {
++                                      temperature = <100000>;
++                                      hysteresis = <1000>;
++                                      type = "passive";
++                              };
++                      };
++
++                      cooling-maps {
++                              map0 {
++                                      trip = <&cpu_alert>;
++                                      cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++                                                       <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++                              };
 +                      };
 +              };
 +
 +              gephy-thermal {
-+                      polling-delay-passive = <0>;
-+                      polling-delay = <0>;
 +                      thermal-sensors = <&tsens 4>;
 +
 +                      trips {
 +                              gephy-critical {
 +                                      temperature = <120000>;
-+                                      hysteresis = <2>;
++                                      hysteresis = <1000>;
 +                                      type = "critical";
 +                              };
 +                      };
 +              };
 +
 +              top-glue-thermal {
-+                      polling-delay-passive = <0>;
-+                      polling-delay = <0>;
 +                      thermal-sensors = <&tsens 3>;
 +
 +                      trips {
-+                              top_glue-critical {
++                              top-glue-critical {
 +                                      temperature = <120000>;
-+                                      hysteresis = <2>;
++                                      hysteresis = <1000>;
 +                                      type = "critical";
 +                              };
 +                      };
 +              };
 +
 +              ubi32-thermal {
-+                      polling-delay-passive = <0>;
-+                      polling-delay = <0>;
 +                      thermal-sensors = <&tsens 1>;
 +
 +                      trips {
 +                              ubi32-critical {
 +                                      temperature = <120000>;
-+                                      hysteresis = <2>;
++                                      hysteresis = <1000>;
 +                                      type = "critical";
 +                              };
 +                      };
diff --git a/target/linux/qualcommax/patches-6.12/0180-arm64-dts-qcom-ipq5018-Remove-tsens-v1-fallback-compatible.patch b/target/linux/qualcommax/patches-6.12/0180-arm64-dts-qcom-ipq5018-Remove-tsens-v1-fallback-compatible.patch
new file mode 100644 (file)
index 0000000..c4e5a1c
--- /dev/null
@@ -0,0 +1,109 @@
+From patchwork Mon Aug 18 11:33:47 2025
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: George Moussalem <george.moussalem@outlook.com>
+X-Patchwork-Id: 14192807
+Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org
+ [10.30.226.201])
+       (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+       (No client certificate requested)
+       by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEFC62E22A9;
+       Mon, 18 Aug 2025 11:33:51 +0000 (UTC)
+Authentication-Results: smtp.subspace.kernel.org;
+ arc=none smtp.client-ip=10.30.226.201
+ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
+       t=1755516831; cv=none;
+ b=VqLETc4T2um7UBDoagDhE5FaVjJLNoLCW45q/LUrwXoemwWqIFZm7XVzEyPjuUDYlgOw9BuQEdRd7nWhXOVdv1pxkbIOt4gS7MPPVGBilyaXc/sWLyd8qk0KNcIXV1rGmEZ7Ywn0BdnngdNfSAQvSACHhpyMZpGXRodCNPE5cls=
+ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
+       s=arc-20240116; t=1755516831; c=relaxed/simple;
+       bh=ZZKBTpL6UHyciqnKATbtrkmYynWeMCWrFd/2xcp++ww=;
+       h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
+        In-Reply-To:To:Cc;
+ b=XU6nlgSFgahhOxRhNcFU7wdAqhbLs8Ra7XxTipYaqKQqtp7v39J0ju+HaZOu9YE8a+aN4qG3R/YMTtCxZWejrgk6wU7nT/KBLqhjd1G2f0bWq/4NipYk+S7xYZyfe2lpNpZ2SRUI/1h6BFPoUnMzTeeuH8VjX/qIM3oLVe2s968=
+ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
+ dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
+ header.b=PKBRtdr/; arc=none smtp.client-ip=10.30.226.201
+Authentication-Results: smtp.subspace.kernel.org;
+       dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
+ header.b="PKBRtdr/"
+Received: by smtp.kernel.org (Postfix) with ESMTPS id 7CDF3C4CEED;
+       Mon, 18 Aug 2025 11:33:51 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
+       s=k20201202; t=1755516831;
+       bh=ZZKBTpL6UHyciqnKATbtrkmYynWeMCWrFd/2xcp++ww=;
+       h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From;
+       b=PKBRtdr/YTJTrl92zpHzzAovfqaynlZxJFZ667MTjd+V2zpPVbh/Qw2YkWFGl8Zeg
+        JIv0gaRa7PdagA1GA06EbVEy4GO0sNTdf6FR9uMTB8QJLoShXHrFGEgBkV0GrW6GR2
+        l8QjDRsmfKbIfV7udOOmrqR83UfsKpyVH4F39JlEvteIsWQni/6UESQxGlGkBryduS
+        E2cVKO6sKNLJP6QVQf3TJeZsf5Xb+y/3xsqurGnhx7LD7r26jt0UaWQouihdlLn4lj
+        AEw/X1Kg1G29aq65wiw0DT5mBXOiR0gDatBMXU/FSddyoCFlqbrMLijDrt/R6gGmcS
+        tgOzuwrEZQhrA==
+Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org
+ (localhost.localdomain [127.0.0.1])
+       by smtp.lore.kernel.org (Postfix) with ESMTP id 6E9D7CA0EE4;
+       Mon, 18 Aug 2025 11:33:51 +0000 (UTC)
+Date: Mon, 18 Aug 2025 15:33:47 +0400
+Subject: [PATCH 2/2] arm64: dts: qcom: ipq5018: Remove tsens v1 fallback
+ compatible
+Precedence: bulk
+X-Mailing-List: linux-arm-msm@vger.kernel.org
+List-Id: <linux-arm-msm.vger.kernel.org>
+List-Subscribe: <mailto:linux-arm-msm+subscribe@vger.kernel.org>
+List-Unsubscribe: <mailto:linux-arm-msm+unsubscribe@vger.kernel.org>
+MIME-Version: 1.0
+Message-Id: <20250818-ipq5018-tsens-fix-v1-2-0f08cf09182d@outlook.com>
+References: <20250818-ipq5018-tsens-fix-v1-0-0f08cf09182d@outlook.com>
+In-Reply-To: <20250818-ipq5018-tsens-fix-v1-0-0f08cf09182d@outlook.com>
+To: Amit Kucheria <amitk@kernel.org>,
+ Thara Gopinath <thara.gopinath@gmail.com>,
+ "Rafael J. Wysocki" <rafael@kernel.org>,
+ Daniel Lezcano <daniel.lezcano@linaro.org>, Zhang Rui <rui.zhang@intel.com>,
+ Lukasz Luba <lukasz.luba@arm.com>, Rob Herring <robh@kernel.org>,
+ Krzysztof Kozlowski <krzk+dt@kernel.org>,
+ Conor Dooley <conor+dt@kernel.org>,
+ Sricharan Ramabadhran <quic_srichara@quicinc.com>,
+ Bjorn Andersson <andersson@kernel.org>,
+ Konrad Dybcio <konradybcio@kernel.org>
+Cc: linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org,
+ devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
+ George Moussalem <george.moussalem@outlook.com>,
+ Dmitry Baryshkov <lumag@kernel.org>,
+ Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+X-Mailer: b4 0.14.2
+X-Developer-Signature: v=1; a=ed25519-sha256; t=1755516829; l=972;
+ i=george.moussalem@outlook.com; s=20250321; h=from:subject:message-id;
+ bh=HJcOgtw7oiilIyh0aWOOzNZ2iln5P6lSb3GMC6Gave0=;
+ b=uR1EVwZAX79JKZzxxM9N7TA/hO1CtlDORhZ/FGhSsA68dLhwH953wdmIPFDj4vfeWpsTsB3Bh
+ 4W66WWUho9RBMALQ66he3JtRH90AzRDuzcypOj7GRnzE6ehzDO8Gl3R
+X-Developer-Key: i=george.moussalem@outlook.com; a=ed25519;
+ pk=/PuRTSI9iYiHwcc6Nrde8qF4ZDhJBlUgpHdhsIjnqIk=
+X-Endpoint-Received: by B4 Relay for george.moussalem@outlook.com/20250321
+ with auth_id=364
+X-Original-From: George Moussalem <george.moussalem@outlook.com>
+Reply-To: george.moussalem@outlook.com
+From: George Moussalem <george.moussalem@outlook.com>
+
+From: George Moussalem <george.moussalem@outlook.com>
+
+Remove qcom,tsens-v1 as fallback compatible since this IP has no RPM
+and, as such, must use its own init routine available in the driver.
+
+Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+Signed-off-by: George Moussalem <george.moussalem@outlook.com>
+---
+ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
++++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
+@@ -340,7 +340,7 @@
+               };
+               tsens: thermal-sensor@4a9000 {
+-                      compatible = "qcom,ipq5018-tsens", "qcom,tsens-v1";
++                      compatible = "qcom,ipq5018-tsens";
+                       reg = <0x004a9000 0x1000>,
+                             <0x004a8000 0x1000>;
index b97aa11ebcaf6897c3c8689c4b1ae13ceaad501d..b72f45ed3f097f9e9351dafffdc3ce7bb663245a 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -338,6 +338,16 @@
+@@ -341,6 +341,16 @@
                        reg = <0x01937000 0x21000>;
                };
  
index 135624d97acbdecbd0c517ec1b0e83d66c639a58..e20bde308d2183ce375871675497da046c554d73 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -293,6 +293,30 @@
+@@ -296,6 +296,30 @@
                        #thermal-sensor-cells = <1>;
                };
  
index 23fb94e0e76e3f8a30178030970b1c01fcfaf1bd..1343a61ea8003871fc5620d521a9862ab16d6a74 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -254,6 +254,14 @@
+@@ -257,6 +257,14 @@
                        };
                };
  
@@ -21,5 +21,5 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +              };
 +
                tsens: thermal-sensor@4a9000 {
-                       compatible = "qcom,ipq5018-tsens";
-                       reg = <0x004a9000 0x1000>, /* TM */
+                       compatible = "qcom,ipq5018-tsens", "qcom,tsens-v1";
+                       reg = <0x004a9000 0x1000>,
index c875690b58c8b7d56d246474e24c4b6775ac98c3..de1df4579ba283833150ea8d889a4dc08a0e4be9 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -417,6 +417,16 @@
+@@ -420,6 +420,16 @@
                        status = "disabled";
                };
  
index 70ddcc7147f755f8063dfab7f8d3cd847db6d703..c8802806f5562865891c73ad3290c985f7918f48 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -441,6 +441,21 @@
+@@ -444,6 +444,21 @@
                        status = "disabled";
                };
  
index 516b46743bf50a23ef616262338117324516b7dc..cc6df41db56cd27022a495510dde738a64225ca8 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -456,6 +456,36 @@
+@@ -459,6 +459,36 @@
                        status = "disabled";
                };
  
index e528a9b86d22ec1e625c2b0f2ea597bbef943145..c831080bafd297e12418c2e47a889157bcf363b6 100644 (file)
@@ -10,7 +10,7 @@ Signed-off-by: Ziyang Huang <hzyitc@outlook.com>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -16,6 +16,12 @@
+@@ -17,6 +17,12 @@
        #size-cells = <2>;
  
        clocks {
@@ -23,7 +23,7 @@ Signed-off-by: Ziyang Huang <hzyitc@outlook.com>
                sleep_clk: sleep-clk {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
-@@ -182,6 +188,17 @@
+@@ -185,6 +191,17 @@
                        status = "disabled";
                };
  
index d99f49ccad41957bc4c5d10dfbfad243abdae9dc..81842e0dc5df87006351eb269b984664cb5f86eb 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -188,6 +188,30 @@
+@@ -191,6 +191,30 @@
                        status = "disabled";
                };
  
index e3b1fa970d56d008c6f66348ee82f67c82e71702..987a84ca2ede419de6c5cb790225708f8c5e33a5 100644 (file)
@@ -26,7 +26,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -22,6 +22,18 @@
+@@ -23,6 +23,18 @@
                        #clock-cells = <0>;
                };
  
@@ -45,7 +45,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
                sleep_clk: sleep-clk {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
-@@ -190,7 +202,8 @@
+@@ -193,7 +205,8 @@
  
                mdio0: mdio@88000 {
                        compatible = "qcom,ipq5018-mdio";
@@ -55,7 +55,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
                        #address-cells = <1>;
                        #size-cells = <0>;
  
-@@ -198,6 +211,13 @@
+@@ -201,6 +214,13 @@
                        clock-names = "gcc_mdio_ahb_clk";
  
                        status = "disabled";
@@ -69,7 +69,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
                };
  
                mdio1: mdio@90000 {
-@@ -392,8 +412,8 @@
+@@ -395,8 +415,8 @@
                                 <&pcie0_phy>,
                                 <&pcie1_phy>,
                                 <0>,
index e7dffa891099f12566523bf48df9aaaa3937880a..fd22ba7e3779adc1ba5986f4b7e33ed6267d2da0 100644 (file)
@@ -9,7 +9,7 @@ aren't upstreamed, add the vendor compatible.
 Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -201,7 +201,7 @@
+@@ -204,7 +204,7 @@
                };
  
                mdio0: mdio@88000 {
index d15868892838a99b607b779054a31df3a2581572..f93bbaffc2132e2434c9a97e42a8d9b98b2ab843 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -697,6 +697,225 @@
+@@ -700,6 +700,225 @@
                        };
                };
  
index e2e63837a92de4bbab1ae4686f423d1ee344545d..dccf9adceb24d21ad2cb4b9223b46fc8228528b3 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -123,6 +123,11 @@
+@@ -126,6 +126,11 @@
                #size-cells = <2>;
                ranges;