ARM: dts: qcom: pm8921: 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-26-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi
index fa00b57e28b9e27205fe04040b16c912dfce8c02..360a179670c549dbc8a5addc3bdff85cf04a3578 100644 (file)
--- a/arch/arm/boot/dts/qcom/pm8921.dtsi
+++ b/arch/arm/boot/dts/qcom/pm8921.dtsi
@@ -11,9 +11,8 @@
                pwrkey@1c {
                        compatible = "qcom,pm8921-pwrkey";
                        reg = <0x1c>;
-                       interrupt-parent = <&pm8921>;
-                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
-                                    <51 IRQ_TYPE_EDGE_RISING>;
+                       interrupts-extended = <&pm8921 50 IRQ_TYPE_EDGE_RISING>,
+                                             <&pm8921 51 IRQ_TYPE_EDGE_RISING>;
                        debounce = <15625>;
                        pull-up;
                };
@@ -32,17 +31,15 @@
                rtc@11d {
                        compatible = "qcom,pm8921-rtc";
                        reg = <0x11d>;
-                       interrupt-parent = <&pm8921>;
-                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+                       interrupts-extended = <&pm8921 39 IRQ_TYPE_EDGE_RISING>;
                        allow-set-time;
                };
 
                pm8921_keypad: keypad@148 {
                        compatible = "qcom,pm8921-keypad";
                        reg = <0x148>;
-                       interrupt-parent = <&pm8921>;
-                       interrupts = <74 IRQ_TYPE_EDGE_RISING>,
-                                    <75 IRQ_TYPE_EDGE_RISING>;
+                       interrupts-extended = <&pm8921 74 IRQ_TYPE_EDGE_RISING>,
+                                             <&pm8921 75 IRQ_TYPE_EDGE_RISING>;
                        debounce = <15>;
                        scan-delay = <32>;
                        row-hold = <91500>;