ARM: dts: qcom: msm8960: move PMIC interrupts to the board files

The interrupt of SSBI PMICs is routed to the SoCs GPIO. As such, it is
not a property of the SoC, it is a property of the particular board
(even if it is standard and unified between all devices). Move these
interrupt specifications to the board files.

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-16-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
index 4641b4f2195dcfd272581625b61b2105960edbe3..43149c90c4fc175a29e72516c4756de5fc23aa6d 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
@@ -88,6 +88,10 @@
        };
 };
 
+&pm8921 {
+       interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
+};
+
 &pm8921_keypad {
        linux,keymap = <
                MATRIX_KEY(0, 0, KEY_VOLUMEUP)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
index 13e85c2874987110b44ac1947cfdadc6e68d01b8..9e203164beb62e0a1a1bcc72e2e1eb647066a389 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
@@ -84,6 +84,10 @@
        };
 };
 
+&pm8921 {
+       interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
+};
+
 &rpm {
        regulators {
                compatible = "qcom,rpm-pm8921-regulators";

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index ea2d961b266bf2de71af024d1e3aee16e2b9e619..f1267c83d67ab710192bb92284b619864e137b19 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -266,8 +266,6 @@
 
                        pm8921: pmic {
                                compatible = "qcom,pm8921";
-                               interrupt-parent = <&msmgpio>;
-                               interrupts = <104 IRQ_TYPE_LEVEL_LOW>;
                                #interrupt-cells = <2>;
                                interrupt-controller;
                                #address-cells = <1>;