arm64: dts: mediatek: mt8183: Use interrupts-extended where possible

Change all instances of interrupt-parent + interrupts to one line
as interrupts-extended where possible across all MT8183 DTs to both
simplify and reduce code size.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi
index 2c69e7658dba6df23e1033f862c98ef18c1028d0..8b57706ac8140b91fbeeca6b806ccd1fa2fb0558 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi
@@ -11,8 +11,7 @@
                pinctrl-0 = <&da7219_pins>;
                compatible = "dlg,da7219";
                reg = <0x1a>;
-               interrupt-parent = <&pio>;
-               interrupts = <165 IRQ_TYPE_LEVEL_LOW 165 0>;
+               interrupts-extended = <&pio 165 IRQ_TYPE_LEVEL_LOW>;
 
                dlg,micbias-lvl = <2600>;
                dlg,mic-amp-in-sel = "diff";

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi
index 0799c48ade19e302a384381977b2e2edaded9b24..548e22c194a21c4df39976542f420117fc606b01 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi
@@ -11,8 +11,7 @@
                pinctrl-0 = <&ts3a227e_pins>;
                compatible = "ti,ts3a227e";
                reg = <0x3b>;
-               interrupt-parent = <&pio>;
-               interrupts = <157 IRQ_TYPE_LEVEL_LOW>;
+               interrupts-extended = <&pio 157 IRQ_TYPE_LEVEL_LOW>;
                status = "okay";
        };
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts
index 552bfc72699945bd86f84a8688edb3bd80be4869..0b45aee2e29953b6117b462034a00dff2596b9ff 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts
@@ -18,8 +18,7 @@
 
        compatible = "hid-over-i2c";
        reg = <0x10>;
-       interrupt-parent = <&pio>;
-       interrupts = <155 IRQ_TYPE_LEVEL_LOW>;
+       interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&touchscreen_pins>;
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
index 77b96ddf648ebe636b9ce84fbe9f3215e593aeaa..b595622e7beea31657bffcc32003f574c41cdcf8 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
@@ -30,8 +30,7 @@
 
        compatible = "hid-over-i2c";
        reg = <0x10>;
-       interrupt-parent = <&pio>;
-       interrupts = <155 IRQ_TYPE_LEVEL_LOW>;
+       interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&touchscreen_pins>;
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
index 37e6e58f63b7e3623e843d5fd8c6869c417de2e8..5a1c39318a6caaa545be5b5c88cd6b877f346c65 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
@@ -17,8 +17,7 @@
 
        compatible = "hid-over-i2c";
        reg = <0x10>;
-       interrupt-parent = <&pio>;
-       interrupts = <155 IRQ_TYPE_LEVEL_LOW>;
+       interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&touchscreen_pins>;
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts
index 0e09604004d5e74dc67ab54d7dc3c1a0f2341441..3ea4fdb401184fb5316bbb94e77ae9fad1bb3f94 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts
@@ -17,8 +17,7 @@
 
        compatible = "hid-over-i2c";
        reg = <0x10>;
-       interrupt-parent = <&pio>;
-       interrupts = <155 IRQ_TYPE_LEVEL_LOW>;
+       interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&touchscreen_pins>;
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
index a11adeb29b1f2ed64e1e837a67d56a19e82b648d..a23543d7a11e978fcd2e07f7231d819cb84ac53f 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
@@ -70,8 +70,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&open_touch>;
 
-               interrupt-parent = <&pio>;
-               interrupts = <155 IRQ_TYPE_EDGE_FALLING>;
+               interrupts-extended = <&pio 155 IRQ_TYPE_EDGE_FALLING>;
 
                post-power-on-delay-ms = <10>;
                hid-descr-addr = <0x0001>;

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi
index 4864c39e53a4fdef83395e89373ab86bf477a490..306c95166f3fecb83d88e4c8585ad4c33315d201 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi
@@ -48,8 +48,7 @@
        touchscreen: touchscreen@10 {
                compatible = "hid-over-i2c";
                reg = <0x10>;
-               interrupt-parent = <&pio>;
-               interrupts = <155 IRQ_TYPE_LEVEL_LOW>;
+               interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&touch_default>;
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi
index d5f41c6c98814a90cd0f63d36dfeaf9f021e4966..382e4c6d7191c0325c666b966dca197f8b871b0a 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi
@@ -54,8 +54,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&open_touch>;
 
-               interrupt-parent = <&pio>;
-               interrupts = <155 IRQ_TYPE_EDGE_FALLING>;
+               interrupts-extended = <&pio 155 IRQ_TYPE_EDGE_FALLING>;
 
                post-power-on-delay-ms = <10>;
                hid-descr-addr = <0x0001>;

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
index bf7de35ffcbc8ae440c34761d0a8578b9b69bc73..adadfc653f39a7ad0a1889561e20379ff87a847a 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -890,8 +890,7 @@
                spi-max-frequency = <1000000>;
                pinctrl-names = "default";
                pinctrl-0 = <&h1_int_od_l>;
-               interrupt-parent = <&pio>;
-               interrupts = <153 IRQ_TYPE_EDGE_RISING>;
+               interrupts-extended = <&pio 153 IRQ_TYPE_EDGE_RISING>;
        };
 };
 
@@ -918,8 +917,7 @@
                compatible = "google,cros-ec-spi";
                reg = <0>;
                spi-max-frequency = <3000000>;
-               interrupt-parent = <&pio>;
-               interrupts = <151 IRQ_TYPE_LEVEL_LOW>;
+               interrupts-extended = <&pio 151 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ec_ap_int_odl>;