From: Greg Kroah-Hartman Date: Wed, 5 Feb 2025 13:13:16 +0000 (+0100) Subject: fixed up arm64-dts-qcom-sc7180-fix-psci-power-domain-node-nam.patch X-Git-Tag: v6.6.76~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11b549e1af1778f5af85b1a9e122efe390bcf2cb;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 81ebab3703..0000000000 --- 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 -Date: Mon, 30 Dec 2024 13:44:48 +0100 -Subject: arm64: dts: qcom: sc7180: fix psci power domain node names - -From: Neil Armstrong - -[ 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 -Reviewed-by: Dmitry Baryshkov -Signed-off-by: Neil Armstrong -Link: https://lore.kernel.org/r/20241230-topic-misc-dt-fixes-v4-5-1e6880e9dda3@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - 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 index 0000000000..6f7d1afbe7 --- /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 +Date: Mon, 30 Dec 2024 13:44:48 +0100 +Subject: arm64: dts: qcom: sc7180: fix psci power domain node names + +From: Neil Armstrong + +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 +Reviewed-by: Dmitry Baryshkov +Signed-off-by: Neil Armstrong +Link: https://lore.kernel.org/r/20241230-topic-misc-dt-fixes-v4-5-1e6880e9dda3@linaro.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + 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 c168d10577..460b5da576 100644 --- 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