From: Greg Kroah-Hartman Date: Sat, 3 Feb 2024 16:02:19 +0000 (-0800) Subject: drop arm-dts patch X-Git-Tag: v6.1.77~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b80bab5f1b3574c6f0de49e4f8a5edc76e3f179;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index c2d7e5356f3..00000000000 --- 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 -Date: Thu, 28 Sep 2023 14:02:44 +0300 -Subject: ARM: dts: qcom: msm8960: fix PMIC node labels - -From: Dmitry Baryshkov - -[ Upstream commit a10a09f34eb80b83ca7275e23bf982dae2aa7632 ] - -Change PM8921 node labels to start with pm8921_ prefix, following other -Qualcomm PMIC device nodes. - -Reviewed-by: Konrad Dybcio -Signed-off-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20230928110309.1212221-12-dmitry.baryshkov@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - 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 e069e2975b5..3aebe636a3f 100644 --- 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 index 9188c3831b1..00000000000 --- 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 -Date: Thu, 28 Sep 2023 14:02:44 +0300 -Subject: ARM: dts: qcom: msm8960: fix PMIC node labels - -From: Dmitry Baryshkov - -[ Upstream commit a10a09f34eb80b83ca7275e23bf982dae2aa7632 ] - -Change PM8921 node labels to start with pm8921_ prefix, following other -Qualcomm PMIC device nodes. - -Reviewed-by: Konrad Dybcio -Signed-off-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20230928110309.1212221-12-dmitry.baryshkov@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - 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 6503cb541a7..488e172c2c8 100644 --- 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