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

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
index 0c2f2a46927f0897545331ea14367b933c3c1784..d6fb2bc7f32ffc1265b3ebc744a3756f5cc938b7 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
@@ -184,6 +184,14 @@
        remote-endpoint = <&dsi0_in>;
 };
 
+&pm8821 {
+       interrupts-extended = <&tlmm_pinmux 76 IRQ_TYPE_LEVEL_LOW>;
+};
+
+&pm8921 {
+       interrupts-extended = <&tlmm_pinmux 74 IRQ_TYPE_LEVEL_LOW>;
+};
+
 &rpm {
        regulators {
                vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
index d6ecfd8addb7ae32ad71ee09961815d994721883..c01254b1a3a787ad3c670d67cdcc483eb9d2c314 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
@@ -69,6 +69,14 @@
        status = "okay";
 };
 
+&pm8821 {
+       interrupts-extended = <&tlmm_pinmux 76 IRQ_TYPE_LEVEL_LOW>;
+};
+
+&pm8921 {
+       interrupts-extended = <&tlmm_pinmux 74 IRQ_TYPE_LEVEL_LOW>;
+};
+
 &pm8921_gpio {
        wlan_default_gpios: wlan-gpios-state {
                pinconf {

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
index b0c5e7bd5e74e1fac69674b7bb9662f6eb0a4170..4cd14b121b653ffb5ba26f462eebbe9f70a83a85 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
@@ -170,6 +170,14 @@
        perst-gpios = <&tlmm_pinmux 27 GPIO_ACTIVE_LOW>;
 };
 
+&pm8821 {
+       interrupts-extended = <&tlmm_pinmux 76 IRQ_TYPE_LEVEL_LOW>;
+};
+
+&pm8921 {
+       interrupts-extended = <&tlmm_pinmux 74 IRQ_TYPE_LEVEL_LOW>;
+};
+
 &pm8921_gpio {
        wlan_default_gpios: wlan-gpios-state {
                pinconf {

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
index 9244512b74d1e1da1a5f50ed776ec564d43afc25..7917f16570254aac6ba1807d890f1d40c477524e 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
@@ -65,6 +65,14 @@
        status = "okay";
 };
 
+&pm8821 {
+       interrupts-extended = <&tlmm_pinmux 76 IRQ_TYPE_LEVEL_LOW>;
+};
+
+&pm8921 {
+       interrupts-extended = <&tlmm_pinmux 74 IRQ_TYPE_LEVEL_LOW>;
+};
+
 &pm8921_gpio {
        gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio3", "gpio4", "gpio29", "gpio35";

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
index 07e854a886d2a9620a27eb8d9f28c3eba209933a..3bf9b6e61f524660311be7b960d23bf82205c522 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
@@ -662,8 +662,6 @@
 
                        pm8821: pmic {
                                compatible = "qcom,pm8821";
-                               interrupt-parent = <&tlmm_pinmux>;
-                               interrupts = <76 IRQ_TYPE_LEVEL_LOW>;
                                #interrupt-cells = <2>;
                                interrupt-controller;
                                #address-cells = <1>;
@@ -688,8 +686,6 @@
 
                        pm8921: pmic {
                                compatible = "qcom,pm8921";
-                               interrupt-parent = <&tlmm_pinmux>;
-                               interrupts = <74 8>;
                                #interrupt-cells = <2>;
                                interrupt-controller;
                                #address-cells = <1>;