arm64: dts: qcom: fix pm8150 gpio interrupts

[ Upstream commit 61d2ca503d0b55d2849fd656ce51d8e1e9ba0b6c ]

This was mistakenly copied from the downstream dts, however the upstream
driver works differently.

I only tested this with the pm8150_gpios node (used with volume button),
but the 2 others should be the same.

Fixes: e92b61c8e775 ("arm64: dts: qcom: pm8150l: Add base dts file")
Fixes: 229d5bcad0d0 ("arm64: dts: qcom: pm8150b: Add base dts file")
Fixes: 5101f22a5c37 ("arm64: dts: qcom: pm8150: Add base dts file")
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Link: https://lore.kernel.org/r/20200420153543.14512-1-jonathan@marek.ca
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/pm8150.dtsi b/arch/arm64/boot/dts/qcom/pm8150.dtsi
index b6e3047..c0b1974 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi
@@ -73,18 +73,8 @@
                        reg = <0xc000>;
                        gpio-controller;
                        #gpio-cells = <2>;
-                       interrupts = <0x0 0xc0 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc1 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc2 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc3 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc4 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc5 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc6 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc7 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc8 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xc9 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xca 0x0 IRQ_TYPE_NONE>,
-                                    <0x0 0xcb 0x0 IRQ_TYPE_NONE>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
index 322379d..40b5d75 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
@@ -62,18 +62,8 @@
                        reg = <0xc000>;
                        gpio-controller;
                        #gpio-cells = <2>;
-                       interrupts = <0x2 0xc0 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc1 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc2 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc3 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc4 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc5 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc6 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc7 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc8 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xc9 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xca 0x0 IRQ_TYPE_NONE>,
-                                    <0x2 0xcb 0x0 IRQ_TYPE_NONE>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/qcom/pm8150l.dtsi b/arch/arm64/boot/dts/qcom/pm8150l.dtsi
index eb0e9a0..cf05e06 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8150l.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150l.dtsi
@@ -56,18 +56,8 @@
                        reg = <0xc000>;
                        gpio-controller;
                        #gpio-cells = <2>;
-                       interrupts = <0x4 0xc0 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc1 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc2 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc3 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc4 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc5 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc6 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc7 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc8 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xc9 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xca 0x0 IRQ_TYPE_NONE>,
-                                    <0x4 0xcb 0x0 IRQ_TYPE_NONE>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                };
        };