fixed up arm64-dts-qcom-sc7180-fix-psci-power-domain-node-nam.patch

diff --git a/queue-6.13/arm64-dts-qcom-sc7180-fix-psci-power-domain-node-nam.patch b/queue-6.13/arm64-dts-qcom-sc7180-fix-psci-power-domain-node-nam.patch
deleted file mode 100644 (file)
index 81ebab3..0000000
--- a/queue-6.13/arm64-dts-qcom-sc7180-fix-psci-power-domain-node-nam.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 2266a55d360403434cc21d731fb37330e0abb9d7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 30 Dec 2024 13:44:48 +0100
-Subject: arm64: dts: qcom: sc7180: fix psci power domain node names
-
-From: Neil Armstrong <neil.armstrong@linaro.org>
-
-[ Upstream commit 092febd32a99800902f865ed86b83314faa9c7e4 ]
-
-Rename the psci power domain node names to match the bindings.
-
-This Fixes:
-sc7180-acer-aspire1.dts: psci: 'cpu-cluster0', 'cpu0', 'cpu1', 'cpu2', 'cpu3', 'cpu4', 'cpu5', 'cpu6', 'cpu7' do not match any of the regexes: '^power-domain-', 'pinctrl-[0-9]+'
-
-Reviewed-by: Douglas Anderson <dianders@chromium.org>
-Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
-Link: https://lore.kernel.org/r/20241230-topic-misc-dt-fixes-v4-5-1e6880e9dda3@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 0 files changed
-

diff --git a/queue-6.13/arm64-dts-qcom-sc7180-fix-psci-power-domain-node-names.patch b/queue-6.13/arm64-dts-qcom-sc7180-fix-psci-power-domain-node-names.patch
new file mode 100644 (file)
index 0000000..6f7d1af
--- /dev/null
+++ b/queue-6.13/arm64-dts-qcom-sc7180-fix-psci-power-domain-node-names.patch
@@ -0,0 +1,91 @@
+From 092febd32a99800902f865ed86b83314faa9c7e4 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <neil.armstrong@linaro.org>
+Date: Mon, 30 Dec 2024 13:44:48 +0100
+Subject: arm64: dts: qcom: sc7180: fix psci power domain node names
+
+From: Neil Armstrong <neil.armstrong@linaro.org>
+
+commit 092febd32a99800902f865ed86b83314faa9c7e4 upstream.
+
+Rename the psci power domain node names to match the bindings.
+
+This Fixes:
+sc7180-acer-aspire1.dts: psci: 'cpu-cluster0', 'cpu0', 'cpu1', 'cpu2', 'cpu3', 'cpu4', 'cpu5', 'cpu6', 'cpu7' do not match any of the regexes: '^power-domain-', 'pinctrl-[0-9]+'
+
+Reviewed-by: Douglas Anderson <dianders@chromium.org>
+Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+Link: https://lore.kernel.org/r/20241230-topic-misc-dt-fixes-v4-5-1e6880e9dda3@linaro.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/sc7180.dtsi |   18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
++++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
+@@ -580,55 +580,55 @@
+               compatible = "arm,psci-1.0";
+               method = "smc";
+ 
+-              cpu_pd0: cpu0 {
++              cpu_pd0: power-domain-cpu0 {
+                       #power-domain-cells = <0>;
+                       power-domains = <&cluster_pd>;
+                       domain-idle-states = <&little_cpu_sleep_0 &little_cpu_sleep_1>;
+               };
+ 
+-              cpu_pd1: cpu1 {
++              cpu_pd1: power-domain-cpu1 {
+                       #power-domain-cells = <0>;
+                       power-domains = <&cluster_pd>;
+                       domain-idle-states = <&little_cpu_sleep_0 &little_cpu_sleep_1>;
+               };
+ 
+-              cpu_pd2: cpu2 {
++              cpu_pd2: power-domain-cpu2 {
+                       #power-domain-cells = <0>;
+                       power-domains = <&cluster_pd>;
+                       domain-idle-states = <&little_cpu_sleep_0 &little_cpu_sleep_1>;
+               };
+ 
+-              cpu_pd3: cpu3 {
++              cpu_pd3: power-domain-cpu3 {
+                       #power-domain-cells = <0>;
+                       power-domains = <&cluster_pd>;
+                       domain-idle-states = <&little_cpu_sleep_0 &little_cpu_sleep_1>;
+               };
+ 
+-              cpu_pd4: cpu4 {
++              cpu_pd4: power-domain-cpu4 {
+                       #power-domain-cells = <0>;
+                       power-domains = <&cluster_pd>;
+                       domain-idle-states = <&little_cpu_sleep_0 &little_cpu_sleep_1>;
+               };
+ 
+-              cpu_pd5: cpu5 {
++              cpu_pd5: power-domain-cpu5 {
+                       #power-domain-cells = <0>;
+                       power-domains = <&cluster_pd>;
+                       domain-idle-states = <&little_cpu_sleep_0 &little_cpu_sleep_1>;
+               };
+ 
+-              cpu_pd6: cpu6 {
++              cpu_pd6: power-domain-cpu6 {
+                       #power-domain-cells = <0>;
+                       power-domains = <&cluster_pd>;
+                       domain-idle-states = <&big_cpu_sleep_0 &big_cpu_sleep_1>;
+               };
+ 
+-              cpu_pd7: cpu7 {
++              cpu_pd7: power-domain-cpu7 {
+                       #power-domain-cells = <0>;
+                       power-domains = <&cluster_pd>;
+                       domain-idle-states = <&big_cpu_sleep_0 &big_cpu_sleep_1>;
+               };
+ 
+-              cluster_pd: cpu-cluster0 {
++              cluster_pd: power-domain-cluster {
+                       #power-domain-cells = <0>;
+                       domain-idle-states = <&cluster_sleep_pc
+                                             &cluster_sleep_cx_ret

diff --git a/queue-6.13/series b/queue-6.13/series
index c168d10577e079807b42d1407ec64ff72f3dc4ee..460b5da57653e56206c4b58634b2bb49ba66f868 100644 (file)
--- a/queue-6.13/series
+++ b/queue-6.13/series
@@ -405,7 +405,7 @@ arm64-dts-qcom-sdm845-db845c-navigation-mezzanine-re.patch
 arm64-dts-qcom-sc7180-trogdor-quackingstick-add-miss.patch
 arm64-dts-qcom-sc7180-trogdor-pompom-rename-5v-choke.patch
 hid-core-fix-assumption-that-resolution-multipliers-must-be-in-logical-collections.patch
-arm64-dts-qcom-sc7180-fix-psci-power-domain-node-nam.patch
+arm64-dts-qcom-sc7180-fix-psci-power-domain-node-names.patch
 arm64-dts-qcom-sm8150-microsoft-surface-duo-fix-typo.patch
 arm64-dts-qcom-sc8280xp-fix-up-remoteproc-register-s.patch
 firmware-qcom-scm-cleanup-global-__scm-on-probe-fail.patch