]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: dts: qcom: sm8550: switch to interrupt-cells 4 to add PPI partitions
authorNeil Armstrong <neil.armstrong@linaro.org>
Wed, 20 Aug 2025 09:49:22 +0000 (11:49 +0200)
committerBjorn Andersson <andersson@kernel.org>
Sun, 24 Aug 2025 02:37:15 +0000 (21:37 -0500)
The ARM PMUs shares the same per-cpu (PPI) interrupt, so we need to switch
to interrupt-cells = <4> in the GIC node to allow adding an interrupt
partition map phandle as the 4th cell value for GIC_PPI interrupts.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20250820-topic-sm8550-upstream-pmu-ppi-4-cells-v1-1-a8915672e996@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
arch/arm64/boot/dts/qcom/sm8550.dtsi

index 38d139d1dd4a994287c03d064ca01d59a11ac771..2ebe02e2ca8c03ac9b987af720c7ebe1cd63afec 100644 (file)
 
        pmu-a510 {
                compatible = "arm,cortex-a510-pmu";
-               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW 0>;
        };
 
        pmu-a710 {
                compatible = "arm,cortex-a710-pmu";
-               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW 0>;
        };
 
        pmu-a715 {
                compatible = "arm,cortex-a715-pmu";
-               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW 0>;
        };
 
        pmu-x3 {
                compatible = "arm,cortex-x3-pmu";
-               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW 0>;
        };
 
        psci {
                ipcc: mailbox@408000 {
                        compatible = "qcom,sm8550-ipcc", "qcom,ipcc";
                        reg = <0 0x00408000 0 0x1000>;
-                       interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-controller;
                        #interrupt-cells = <3>;
                        #mbox-cells = <2>;
                        compatible = "qcom,sm8550-gpi-dma", "qcom,sm6350-gpi-dma";
                        #dma-cells = <3>;
                        reg = <0 0x00800000 0 0x60000>;
-                       interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 590 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 591 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 593 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 594 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 595 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 596 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 597 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 598 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 599 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 590 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 591 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 593 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 594 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 595 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 596 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 597 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 598 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 599 IRQ_TYPE_LEVEL_HIGH 0>;
                        dma-channels = <12>;
                        dma-channel-mask = <0x3e>;
                        iommus = <&apps_smmu 0x436 0>;
                                clocks = <&gcc GCC_QUPV3_WRAP2_S0_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c8_data_clk>;
-                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00880000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP2_S0_CLK>;
-                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi8_data_clk>, <&qup_spi8_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c9_data_clk>;
-                               interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00884000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>;
-                               interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi9_data_clk>, <&qup_spi9_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP2_S2_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c10_data_clk>;
-                               interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00888000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP2_S2_CLK>;
-                               interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi10_data_clk>, <&qup_spi10_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP2_S3_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c11_data_clk>;
-                               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x0088c000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP2_S3_CLK>;
-                               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi11_data_clk>, <&qup_spi11_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP2_S4_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c12_data_clk>;
-                               interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00890000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP2_S4_CLK>;
-                               interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi12_data_clk>, <&qup_spi12_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP2_S5_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c13_data_clk>;
-                               interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00894000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP2_S5_CLK>;
-                               interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi13_data_clk>, <&qup_spi13_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP2_S6_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_uart14_default>, <&qup_uart14_cts_rts>;
-                               interrupts = <GIC_SPI 461 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 461 IRQ_TYPE_LEVEL_HIGH 0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
                                                <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
                                clocks = <&gcc GCC_QUPV3_WRAP2_S7_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c15_data_clk>;
-                               interrupts = <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x0089c000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP2_S7_CLK>;
-                               interrupts = <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi15_data_clk>, <&qup_spi15_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c0_data_clk>;
-                               interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c1_data_clk>;
-                               interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c2_data_clk>;
-                               interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c3_data_clk>;
-                               interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c4_data_clk>;
-                               interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c5_data_clk>;
-                               interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c6_data_clk>;
-                               interrupts = <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c7_data_clk>;
-                               interrupts = <GIC_SPI 471 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 471 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c8_data_clk>;
-                               interrupts = <GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                         <&gcc GCC_QUPV3_I2C_CORE_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&hub_i2c9_data_clk>;
-                               interrupts = <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                        compatible = "qcom,sm8550-gpi-dma", "qcom,sm6350-gpi-dma";
                        #dma-cells = <3>;
                        reg = <0 0x00a00000 0 0x60000>;
-                       interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 293 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 294 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 295 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 293 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 294 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 295 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH 0>;
                        dma-channels = <12>;
                        dma-channel-mask = <0x1e>;
                        iommus = <&apps_smmu 0xb6 0>;
                                clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c0_data_clk>;
-                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00a80000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
-                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi0_data_clk>, <&qup_spi0_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c1_data_clk>;
-                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00a84000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
-                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi1_data_clk>, <&qup_spi1_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c2_data_clk>;
-                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00a88000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
-                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi2_data_clk>, <&qup_spi2_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c3_data_clk>;
-                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00a8c000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
-                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi3_data_clk>, <&qup_spi3_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c4_data_clk>;
-                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                reg = <0 0x00a90000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
-                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi4_data_clk>, <&qup_spi4_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c5_data_clk>;
-                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH 0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
                                                <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
                                reg = <0 0x00a94000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
-                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi5_data_clk>, <&qup_spi5_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_i2c6_data_clk>;
-                               interrupts = <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH 0>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
                                                <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
                                reg = <0 0x00a98000 0 0x4000>;
                                clock-names = "se";
                                clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
-                               interrupts = <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_spi6_data_clk>, <&qup_spi6_cs>;
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                clocks = <&gcc GCC_QUPV3_WRAP1_S7_CLK>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&qup_uart7_default>;
-                               interrupts = <GIC_SPI 579 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 579 IRQ_TYPE_LEVEL_HIGH 0>;
                                interconnect-names = "qup-core", "qup-config";
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
                        linux,pci-domain = <0>;
                        num-lanes = <2>;
 
-                       interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "msi0",
                                          "msi1",
                                          "msi2",
                                          "global";
                        #interrupt-cells = <1>;
                        interrupt-map-mask = <0 0 0 0x7>;
-                       interrupt-map = <0 0 0 1 &intc 0 0 0 149 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
-                                       <0 0 0 2 &intc 0 0 0 150 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-                                       <0 0 0 3 &intc 0 0 0 151 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
-                                       <0 0 0 4 &intc 0 0 0 152 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+                       interrupt-map = <0 0 0 1 &intc 0 0 0 149 IRQ_TYPE_LEVEL_HIGH 0>, /* int_a */
+                                       <0 0 0 2 &intc 0 0 0 150 IRQ_TYPE_LEVEL_HIGH 0>, /* int_b */
+                                       <0 0 0 3 &intc 0 0 0 151 IRQ_TYPE_LEVEL_HIGH 0>, /* int_c */
+                                       <0 0 0 4 &intc 0 0 0 152 IRQ_TYPE_LEVEL_HIGH 0>; /* int_d */
 
                        clocks = <&gcc GCC_PCIE_0_AUX_CLK>,
                                 <&gcc GCC_PCIE_0_CFG_AHB_CLK>,
                        linux,pci-domain = <1>;
                        num-lanes = <2>;
 
-                       interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "msi0",
                                          "msi1",
                                          "msi2",
                                          "global";
                        #interrupt-cells = <1>;
                        interrupt-map-mask = <0 0 0 0x7>;
-                       interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
-                                       <0 0 0 2 &intc 0 0 0 435 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-                                       <0 0 0 3 &intc 0 0 0 438 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
-                                       <0 0 0 4 &intc 0 0 0 439 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+                       interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH 0>, /* int_a */
+                                       <0 0 0 2 &intc 0 0 0 435 IRQ_TYPE_LEVEL_HIGH 0>, /* int_b */
+                                       <0 0 0 3 &intc 0 0 0 438 IRQ_TYPE_LEVEL_HIGH 0>, /* int_c */
+                                       <0 0 0 4 &intc 0 0 0 439 IRQ_TYPE_LEVEL_HIGH 0>; /* int_d */
 
                        clocks = <&gcc GCC_PCIE_1_AUX_CLK>,
                                 <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
                cryptobam: dma-controller@1dc4000 {
                        compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
                        reg = <0x0 0x01dc4000 0x0 0x28000>;
-                       interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH 0>;
                        #dma-cells = <1>;
                        qcom,ee = <0>;
                        qcom,num-ees = <4>;
                        compatible = "qcom,sm8550-ufshc", "qcom,ufshc",
                                     "jedec,ufs-2.0";
                        reg = <0x0 0x01d84000 0x0 0x3000>;
-                       interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH 0>;
                        phys = <&ufs_mem_phy>;
                        phy-names = "ufsphy";
                        lanes-per-direction = <2>;
                                    "cx_mem",
                                    "cx_dbgc";
 
-                       interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH 0>;
 
                        iommus = <&adreno_smmu 0 0x0>,
                                 <&adreno_smmu 1 0x0>;
                              <0x0 0x0b280000 0x0 0x10000>;
                        reg-names = "gmu", "rscc", "gmu_pdc";
 
-                       interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "hfi", "gmu";
 
                        clocks = <&gpucc GPU_CC_AHB_CLK>,
                        reg = <0x0 0x03da0000 0x0 0x40000>;
                        #iommu-cells = <2>;
                        #global-interrupts = <1>;
-                       interrupts = <GIC_SPI 673 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 677 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 678 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 679 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 680 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 681 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 682 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 683 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 684 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 685 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 686 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 476 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 574 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 575 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 576 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 577 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 659 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 661 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 665 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 666 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 668 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 669 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 699 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 673 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 677 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 678 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 679 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 680 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 681 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 682 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 683 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 684 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 685 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 686 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 476 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 574 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 575 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 576 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 577 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 659 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 661 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 665 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 666 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 668 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 669 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 699 IRQ_TYPE_LEVEL_HIGH 0>;
                        clocks = <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>,
                                 <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
                                 <&gcc GCC_GPU_SNOC_DVM_GFX_CLK>,
                                    "ipa-shared",
                                    "gsi";
 
-                       interrupts-extended = <&intc GIC_SPI 654 IRQ_TYPE_EDGE_RISING>,
-                                             <&intc GIC_SPI 432 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts-extended = <&intc GIC_SPI 654 IRQ_TYPE_EDGE_RISING 0>,
+                                             <&intc GIC_SPI 432 IRQ_TYPE_LEVEL_HIGH 0>,
                                              <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
                                              <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;
                        interrupt-names = "ipa",
                        compatible = "qcom,sm8550-mpss-pas";
                        reg = <0x0 0x04080000 0x0 0x10000>;
 
-                       interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_EDGE_RISING>,
+                       interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_EDGE_RISING 0>,
                                              <&smp2p_modem_in 0 IRQ_TYPE_EDGE_RISING>,
                                              <&smp2p_modem_in 1 IRQ_TYPE_EDGE_RISING>,
                                              <&smp2p_modem_in 2 IRQ_TYPE_EDGE_RISING>,
                swr3: soundwire@6ab0000 {
                        compatible = "qcom,soundwire-v2.0.0";
                        reg = <0 0x06ab0000 0 0x10000>;
-                       interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH 0>;
                        clocks = <&lpass_wsa2macro>;
                        clock-names = "iface";
                        label = "WSA2";
                swr1: soundwire@6ad0000 {
                        compatible = "qcom,soundwire-v2.0.0";
                        reg = <0 0x06ad0000 0 0x10000>;
-                       interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH 0>;
                        clocks = <&lpass_rxmacro>;
                        clock-names = "iface";
                        label = "RX";
                swr0: soundwire@6b10000 {
                        compatible = "qcom,soundwire-v2.0.0";
                        reg = <0 0x06b10000 0 0x10000>;
-                       interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH 0>;
                        clocks = <&lpass_wsamacro>;
                        clock-names = "iface";
                        label = "WSA";
                swr2: soundwire@6d30000 {
                        compatible = "qcom,soundwire-v2.0.0";
                        reg = <0 0x06d30000 0 0x10000>;
-                       interrupts = <GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "core", "wakeup";
                        clocks = <&lpass_txmacro>;
                        clock-names = "iface";
                        compatible = "qcom,sm8550-sdhci", "qcom,sdhci-msm-v5";
                        reg = <0 0x08804000 0 0x1000>;
 
-                       interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "hc_irq", "pwr_irq";
 
                        clocks = <&gcc GCC_SDCC2_AHB_CLK>,
                        compatible = "qcom,sm8550-iris";
 
                        reg = <0 0x0aa00000 0 0xf0000>;
-                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH 0>;
 
                        power-domains = <&videocc VIDEO_CC_MVS0C_GDSC>,
                                        <&videocc VIDEO_CC_MVS0_GDSC>,
                cci0: cci@ac15000 {
                        compatible = "qcom,sm8550-cci", "qcom,msm8996-cci";
                        reg = <0 0x0ac15000 0 0x1000>;
-                       interrupts = <GIC_SPI 426 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <GIC_SPI 426 IRQ_TYPE_EDGE_RISING 0>;
                        power-domains = <&camcc CAM_CC_TITAN_TOP_GDSC>;
                        clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>,
                                 <&camcc CAM_CC_CPAS_AHB_CLK>,
                cci1: cci@ac16000 {
                        compatible = "qcom,sm8550-cci", "qcom,msm8996-cci";
                        reg = <0 0x0ac16000 0 0x1000>;
-                       interrupts = <GIC_SPI 427 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <GIC_SPI 427 IRQ_TYPE_EDGE_RISING 0>;
                        power-domains = <&camcc CAM_CC_TITAN_TOP_GDSC>;
                        clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>,
                                 <&camcc CAM_CC_CPAS_AHB_CLK>,
                cci2: cci@ac17000 {
                        compatible = "qcom,sm8550-cci", "qcom,msm8996-cci";
                        reg = <0 0x0ac17000 0 0x1000>;
-                       interrupts = <GIC_SPI 428 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <GIC_SPI 428 IRQ_TYPE_EDGE_RISING 0>;
                        power-domains = <&camcc CAM_CC_TITAN_TOP_GDSC>;
                        clocks = <&camcc CAM_CC_CAMNOC_AXI_CLK>,
                                 <&camcc CAM_CC_CPAS_AHB_CLK>,
                                      "vfe_lite_cphy_rx",
                                      "vfe_lite_csid";
 
-                       interrupts = <GIC_SPI 601 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 603 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 431 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 605 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 376 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 477 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 478 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 479 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 448 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 122 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 89 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 278 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 277 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 602 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 604 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 688 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 606 IRQ_TYPE_EDGE_RISING>,
-                                    <GIC_SPI 377 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <GIC_SPI 601 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 603 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 431 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 605 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 376 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 477 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 478 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 479 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 448 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 122 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 89 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 278 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 277 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 602 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 604 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 688 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 606 IRQ_TYPE_EDGE_RISING 0>,
+                                    <GIC_SPI 377 IRQ_TYPE_EDGE_RISING 0>;
                        interrupt-names = "csid0",
                                          "csid1",
                                          "csid2",
                        reg = <0 0x0ae00000 0 0x1000>;
                        reg-names = "mdss";
 
-                       interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-controller;
                        #interrupt-cells = <1>;
 
                                          <&gcc GCC_USB30_PRIM_MASTER_CLK>;
                        assigned-clock-rates = <19200000>, <200000000>;
 
-                       interrupts-extended = <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts-extended = <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH 0>,
+                                             <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>,
+                                             <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>,
                                              <&pdc 14 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 15 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 17 IRQ_TYPE_LEVEL_HIGH>;
                        reg = <0 0x0c271000 0 0x1000>, /* TM */
                              <0 0x0c222000 0 0x1000>; /* SROT */
                        #qcom,sensors = <16>;
-                       interrupts = <GIC_SPI 506 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 640 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 506 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 640 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "uplow", "critical";
                        #thermal-sensor-cells = <1>;
                };
                        reg = <0 0x0c272000 0 0x1000>, /* TM */
                              <0 0x0c223000 0 0x1000>; /* SROT */
                        #qcom,sensors = <16>;
-                       interrupts = <GIC_SPI 507 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 641 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 507 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 641 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "uplow", "critical";
                        #thermal-sensor-cells = <1>;
                };
                        reg = <0 0x0c273000 0 0x1000>, /* TM */
                              <0 0x0c224000 0 0x1000>; /* SROT */
                        #qcom,sensors = <16>;
-                       interrupts = <GIC_SPI 508 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 642 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 508 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 642 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "uplow", "critical";
                        #thermal-sensor-cells = <1>;
                };
                tlmm: pinctrl@f100000 {
                        compatible = "qcom,sm8550-tlmm";
                        reg = <0 0x0f100000 0 0x300000>;
-                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH 0>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        reg = <0 0x15000000 0 0x100000>;
                        #iommu-cells = <2>;
                        #global-interrupts = <1>;
-                       interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 396 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 398 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 399 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 401 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 402 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 403 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 407 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 408 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 706 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 689 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 690 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 691 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 692 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 693 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 694 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 695 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 696 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 396 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 398 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 399 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 401 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 402 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 403 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 407 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 408 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 706 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 689 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 690 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 691 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 692 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 693 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 694 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 695 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 696 IRQ_TYPE_LEVEL_HIGH 0>;
                        dma-coherent;
                };
 
                        reg = <0 0x17100000 0 0x10000>,         /* GICD */
                              <0 0x17180000 0 0x200000>;        /* GICR * 8 */
                        ranges;
-                       #interrupt-cells = <3>;
+                       #interrupt-cells = <4>;
                        interrupt-controller;
                        #redistributor-regions = <1>;
                        redistributor-stride = <0 0x40000>;
-                       interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_LOW>;
+                       interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_LOW 0>;
                        #address-cells = <2>;
                        #size-cells = <2>;
 
                                reg = <0x17421000 0x1000>,
                                      <0x17422000 0x1000>;
                                frame-number = <0>;
-                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH 0>,
+                                            <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        frame@17423000 {
                                reg = <0x17423000 0x1000>;
                                frame-number = <1>;
-                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH 0>;
                                status = "disabled";
                        };
 
                        frame@17425000 {
                                reg = <0x17425000 0x1000>;
                                frame-number = <2>;
-                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH 0>;
                                status = "disabled";
                        };
 
                        frame@17427000 {
                                reg = <0x17427000 0x1000>;
                                frame-number = <3>;
-                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH 0>;
                                status = "disabled";
                        };
 
                        frame@17429000 {
                                reg = <0x17429000 0x1000>;
                                frame-number = <4>;
-                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH 0>;
                                status = "disabled";
                        };
 
                        frame@1742b000 {
                                reg = <0x1742b000 0x1000>;
                                frame-number = <5>;
-                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH 0>;
                                status = "disabled";
                        };
 
                        frame@1742d000 {
                                reg = <0x1742d000 0x1000>;
                                frame-number = <6>;
-                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH 0>;
                                status = "disabled";
                        };
                };
                              <0 0x17a20000 0 0x10000>,
                              <0 0x17a30000 0 0x10000>;
                        reg-names = "drv-0", "drv-1", "drv-2", "drv-3";
-                       interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH 0>;
                        qcom,tcs-offset = <0xd00>;
                        qcom,drv-id = <2>;
                        qcom,tcs-config = <ACTIVE_TCS    3>, <SLEEP_TCS     2>,
                        reg-names = "freq-domain0", "freq-domain1", "freq-domain2";
                        clocks = <&bi_tcxo_div2>, <&gcc GCC_GPLL0>;
                        clock-names = "xo", "alternate";
-                       interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH 0>,
+                                    <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH 0>;
                        interrupt-names = "dcvsh-irq-0", "dcvsh-irq-1", "dcvsh-irq-2";
                        #freq-domain-cells = <1>;
                        #clock-cells = <1>;
                pmu@24091000 {
                        compatible = "qcom,sm8550-llcc-bwmon", "qcom,sc7280-llcc-bwmon";
                        reg = <0 0x24091000 0 0x1000>;
-                       interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH 0>;
                        interconnects = <&mc_virt MASTER_LLCC QCOM_ICC_TAG_ACTIVE_ONLY
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>;
 
                pmu@240b6400 {
                        compatible = "qcom,sm8550-cpu-bwmon", "qcom,sdm845-bwmon";
                        reg = <0 0x240b6400 0 0x600>;
-                       interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH 0>;
                        interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
                                         &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ACTIVE_ONLY>;
 
                                    "llcc3_base",
                                    "llcc_broadcast_base",
                                    "llcc_broadcast_and_base";
-                       interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH 0>;
                };
 
                nsp_noc: interconnect@320c0000 {
                        compatible = "qcom,sm8550-cdsp-pas";
                        reg = <0x0 0x32300000 0x0 0x10000>;
 
-                       interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
+                       interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING 0>,
                                              <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
                                              <&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
                                              <&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,
 
        timer {
                compatible = "arm,armv8-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
+               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW) 0>,
+                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW) 0>,
+                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW) 0>,
+                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW) 0>;
        };
 };