ARM: dts: qcom: pm8058: switch to interrupts-extended

Merge interrups and interrupt-parent properties into a single
interrupts-extended property.

Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
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-28-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi
index 3683d7b60918850b333f220cb5b9186935072e15..984b797779846096e83342646eec8a24981616e9 100644 (file)
--- a/arch/arm/boot/dts/qcom/pm8058.dtsi
+++ b/arch/arm/boot/dts/qcom/pm8058.dtsi
@@ -11,9 +11,8 @@
                pwrkey@1c {
                        compatible = "qcom,pm8058-pwrkey";
                        reg = <0x1c>;
-                       interrupt-parent = <&pm8058>;
-                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
-                                    <51 IRQ_TYPE_EDGE_RISING>;
+                       interrupts-extended = <&pm8058 50 IRQ_TYPE_EDGE_RISING>,
+                                             <&pm8058 51 IRQ_TYPE_EDGE_RISING>;
                        debounce = <15625>;
                        pull-up;
                };
@@ -61,9 +60,8 @@
                pm8058_keypad: keypad@148 {
                        compatible = "qcom,pm8058-keypad";
                        reg = <0x148>;
-                       interrupt-parent = <&pm8058>;
-                       interrupts = <74 IRQ_TYPE_EDGE_RISING>,
-                                    <75 IRQ_TYPE_EDGE_RISING>;
+                       interrupts-extended = <&pm8058 74 IRQ_TYPE_EDGE_RISING>,
+                                             <&pm8058 75 IRQ_TYPE_EDGE_RISING>;
                        debounce = <15>;
                        scan-delay = <32>;
                        row-hold = <91500>;
@@ -136,8 +134,7 @@
                rtc@1e8 {
                        compatible = "qcom,pm8058-rtc";
                        reg = <0x1e8>;
-                       interrupt-parent = <&pm8058>;
-                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+                       interrupts-extended = <&pm8058 39 IRQ_TYPE_EDGE_RISING>;
                        allow-set-time;
                };
        };