drop arm-dts patch

diff --git a/queue-6.6/arm-dts-qcom-msm8960-fix-pmic-node-labels.patch b/queue-6.6/arm-dts-qcom-msm8960-fix-pmic-node-labels.patch
deleted file mode 100644 (file)
index c2d7e53..0000000
--- a/queue-6.6/arm-dts-qcom-msm8960-fix-pmic-node-labels.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9fae0df1e5953fd76e71a4f49d2a00fff7ee2ffb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 28 Sep 2023 14:02:44 +0300
-Subject: ARM: dts: qcom: msm8960: fix PMIC node labels
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit a10a09f34eb80b83ca7275e23bf982dae2aa7632 ]
-
-Change PM8921 node labels to start with pm8921_ prefix, following other
-Qualcomm PMIC device nodes.
-
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20230928110309.1212221-12-dmitry.baryshkov@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
-index d13080fcbeea..9099b858a76f 100644
---- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
-+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
-@@ -264,7 +264,7 @@
-                       reg = <0x500000 0x1000>;
-                       qcom,controller-type = "pmic-arbiter";
- 
--                      pmicintc: pmic {
-+                      pm8921: pmic {
-                               compatible = "qcom,pm8921";
-                               interrupt-parent = <&msmgpio>;
-                               interrupts = <104 IRQ_TYPE_LEVEL_LOW>;
-@@ -276,7 +276,7 @@
-                               pwrkey@1c {
-                                       compatible = "qcom,pm8921-pwrkey";
-                                       reg = <0x1c>;
--                                      interrupt-parent = <&pmicintc>;
-+                                      interrupt-parent = <&pm8921>;
-                                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
-                                                    <51 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15625>;
-@@ -286,7 +286,7 @@
-                               keypad@148 {
-                                       compatible = "qcom,pm8921-keypad";
-                                       reg = <0x148>;
--                                      interrupt-parent = <&pmicintc>;
-+                                      interrupt-parent = <&pm8921>;
-                                       interrupts = <74 IRQ_TYPE_EDGE_RISING>,
-                                                    <75 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15>;
-@@ -296,7 +296,7 @@
- 
-                               rtc@11d {
-                                       compatible = "qcom,pm8921-rtc";
--                                      interrupt-parent = <&pmicintc>;
-+                                      interrupt-parent = <&pm8921>;
-                                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
-                                       reg = <0x11d>;
-                                       allow-set-time;
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index e069e2975b5156dc037a3599102cddbb45cb25c8..3aebe636a3f56d2d1d0863e3f670115a48168905 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -66,7 +66,6 @@ selftests-bpf-fix-issues-in-setup_classid_environmen.patch
 arm-dts-qcom-strip-prefix-from-pmic-files.patch
 arm-dts-qcom-mdm9615-fix-pmic-node-labels.patch
 arm-dts-qcom-msm8660-fix-pmic-node-labels.patch
-arm-dts-qcom-msm8960-fix-pmic-node-labels.patch
 soc-xilinx-fix-for-call-trace-due-to-the-usage-of-sm.patch
 soc-xilinx-fix-unhandled-sgi-warning-message.patch
 scsi-lpfc-fix-possible-file-string-name-overflow-whe.patch

diff --git a/queue-6.7/arm-dts-qcom-msm8960-fix-pmic-node-labels.patch b/queue-6.7/arm-dts-qcom-msm8960-fix-pmic-node-labels.patch
deleted file mode 100644 (file)
index 9188c38..0000000
--- a/queue-6.7/arm-dts-qcom-msm8960-fix-pmic-node-labels.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f467ef980c7ee18f9e33d97783fbfb4bd40e97c9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 28 Sep 2023 14:02:44 +0300
-Subject: ARM: dts: qcom: msm8960: fix PMIC node labels
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit a10a09f34eb80b83ca7275e23bf982dae2aa7632 ]
-
-Change PM8921 node labels to start with pm8921_ prefix, following other
-Qualcomm PMIC device nodes.
-
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20230928110309.1212221-12-dmitry.baryshkov@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
-index d13080fcbeea..9099b858a76f 100644
---- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
-+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
-@@ -264,7 +264,7 @@
-                       reg = <0x500000 0x1000>;
-                       qcom,controller-type = "pmic-arbiter";
- 
--                      pmicintc: pmic {
-+                      pm8921: pmic {
-                               compatible = "qcom,pm8921";
-                               interrupt-parent = <&msmgpio>;
-                               interrupts = <104 IRQ_TYPE_LEVEL_LOW>;
-@@ -276,7 +276,7 @@
-                               pwrkey@1c {
-                                       compatible = "qcom,pm8921-pwrkey";
-                                       reg = <0x1c>;
--                                      interrupt-parent = <&pmicintc>;
-+                                      interrupt-parent = <&pm8921>;
-                                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
-                                                    <51 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15625>;
-@@ -286,7 +286,7 @@
-                               keypad@148 {
-                                       compatible = "qcom,pm8921-keypad";
-                                       reg = <0x148>;
--                                      interrupt-parent = <&pmicintc>;
-+                                      interrupt-parent = <&pm8921>;
-                                       interrupts = <74 IRQ_TYPE_EDGE_RISING>,
-                                                    <75 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15>;
-@@ -296,7 +296,7 @@
- 
-                               rtc@11d {
-                                       compatible = "qcom,pm8921-rtc";
--                                      interrupt-parent = <&pmicintc>;
-+                                      interrupt-parent = <&pm8921>;
-                                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
-                                       reg = <0x11d>;
-                                       allow-set-time;
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 6503cb541a7fb5ae730a1e9522920a3f14470c3b..488e172c2c8c7192d1427abd5dcd80565a30926e 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -71,7 +71,6 @@ selftests-bpf-fix-issues-in-setup_classid_environmen.patch
 arm-dts-qcom-strip-prefix-from-pmic-files.patch
 arm-dts-qcom-mdm9615-fix-pmic-node-labels.patch
 arm-dts-qcom-msm8660-fix-pmic-node-labels.patch
-arm-dts-qcom-msm8960-fix-pmic-node-labels.patch
 soc-xilinx-fix-for-call-trace-due-to-the-usage-of-sm.patch
 soc-xilinx-fix-unhandled-sgi-warning-message.patch
 scsi-lpfc-fix-possible-file-string-name-overflow-whe.patch