arm64: dts: qcom: use defines for interrupts

Replace hard-coded interrupt parts (GIC, flags) with standard defines
for readability.  No changes in resulting DTBs.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230730180638.23539-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
index af6d644a5d38c1527307cab9ba3dcfd7549704c0..6e24f0f2374fe5a16bc02d46fd9ecd9c9af01972 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
@@ -1975,7 +1975,7 @@
                        };
 
                        smd-edge {
-                               interrupts = <GIC_SPI 142 1>;
+                               interrupts = <GIC_SPI 142 IRQ_TYPE_EDGE_RISING>;
                                qcom,ipc = <&apcs1_mbox 8 17>;
                                qcom,smd-edge = <6>;
                                qcom,remote-pid = <4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8976.dtsi b/arch/arm64/boot/dts/qcom/msm8976.dtsi
index ab76806317a7128c00b7a6d93ed4ba40db95676f..f9f5afbcc52bba29dce27ccc3c3427d72605bfe4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8976.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8976.dtsi
@@ -439,7 +439,7 @@
 
                hexagon_smsm: hexagon@1 {
                        reg = <1>;
-                       interrupts = <0 290 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <GIC_SPI 290 IRQ_TYPE_EDGE_RISING>;
 
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index c374fba5d8f9482ec59100484174c92826143e51..c3262571520d3e41a1a39b3c6c3cce2996f53f20 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -456,7 +456,7 @@
                        usb@f9200000 {
                                compatible = "snps,dwc3";
                                reg = <0xf9200000 0xcc00>;
-                               interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
                                snps,dis_u2_susphy_quirk;
                                snps,dis_enblslpm_quirk;
                                maximum-speed = "high-speed";

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 440557c8eca47afaaf7de3b39b61515b84cde329..6f7065e8fd6c67941939ff32c0afc7609dc10490 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -589,7 +589,7 @@
                compatible = "qcom,smp2p";
                qcom,smem = <443>, <429>;
 
-               interrupts = <0 158 IRQ_TYPE_EDGE_RISING>;
+               interrupts = <GIC_SPI 158 IRQ_TYPE_EDGE_RISING>;
 
                mboxes = <&apcs_glb 10>;
 
@@ -1264,7 +1264,7 @@
                        reg = <0x00b00000 0x3f000>;
                        reg-names = "kgsl_3d0_reg_memory";
 
-                       interrupts = <0 300 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
 
                        clocks = <&mmcc GPU_GX_GFX3D_CLK>,
                                <&mmcc GPU_AHB_CLK>,
@@ -3054,7 +3054,7 @@
                        usb3_dwc3: usb@6a00000 {
                                compatible = "snps,dwc3";
                                reg = <0x06a00000 0xcc00>;
-                               interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
                                phys = <&hsusb_phy1>, <&ssusb_phy_0>;
                                phy-names = "usb2-phy", "usb3-phy";
                                snps,hird-threshold = /bits/ 8 <0>;
@@ -3412,7 +3412,7 @@
                        usb2_dwc3: usb@7600000 {
                                compatible = "snps,dwc3";
                                reg = <0x07600000 0xcc00>;
-                               interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
                                phys = <&hsusb_phy2>;
                                phy-names = "usb2-phy";
                                maximum-speed = "high-speed";
@@ -3426,7 +3426,7 @@
                        qcom,controlled-remotely;
                        reg = <0x09184000 0x32000>;
                        num-channels = <31>;
-                       interrupts = <0 164 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
                        #dma-cells = <1>;
                        qcom,ee = <1>;
                        qcom,num-ees = <2>;
@@ -3435,7 +3435,7 @@
                slim_msm: slim-ngd@91c0000 {
                        compatible = "qcom,slim-ngd-v1.5.0";
                        reg = <0x091c0000 0x2c000>;
-                       interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
                        dmas = <&slimbam 3>, <&slimbam 4>;
                        dma-names = "rx", "tx";
                        #address-cells = <1>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 360fe3edcc081284655a79359a34688515d1e95d..a41a34dbcc3cf5e1dfb4f2a008294a7c92e9787b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -1494,7 +1494,7 @@
                                "rbcpr",
                                "core";
 
-                       interrupts = <0 300 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
                        iommus = <&adreno_smmu 0>;
                        operating-points-v2 = <&gpu_opp_table>;
                        power-domains = <&rpmpd MSM8998_VDDMX>;

diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 83afce56a7b093718fe25f86d28ff2f9c1ab646b..ec6003212c4d5f6a4ed62b97bb134f3b718bdbd6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -1034,7 +1034,7 @@
                        reg = <0x05000000 0x40000>;
                        reg-names = "kgsl_3d0_reg_memory";
 
-                       interrupts = <0 300 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
 
                        clocks = <&gcc GCC_GPU_CFG_AHB_CLK>,
                                <&gpucc GPUCC_RBBMTIMER_CLK>,
@@ -2290,50 +2290,50 @@
 
                        frame@17921000 {
                                frame-number = <0>;
-                               interrupts = <0 8 0x4>,
-                                               <0 7 0x4>;
+                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0x17921000 0x1000>,
                                        <0x17922000 0x1000>;
                        };
 
                        frame@17923000 {
                                frame-number = <1>;
-                               interrupts = <0 9 0x4>;
+                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0x17923000 0x1000>;
                                status = "disabled";
                        };
 
                        frame@17924000 {
                                frame-number = <2>;
-                               interrupts = <0 10 0x4>;
+                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0x17924000 0x1000>;
                                status = "disabled";
                        };
 
                        frame@17925000 {
                                frame-number = <3>;
-                               interrupts = <0 11 0x4>;
+                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0x17925000 0x1000>;
                                status = "disabled";
                        };
 
                        frame@17926000 {
                                frame-number = <4>;
-                               interrupts = <0 12 0x4>;
+                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0x17926000 0x1000>;
                                status = "disabled";
                        };
 
                        frame@17927000 {
                                frame-number = <5>;
-                               interrupts = <0 13 0x4>;
+                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0x17927000 0x1000>;
                                status = "disabled";
                        };
 
                        frame@17928000 {
                                frame-number = <6>;
-                               interrupts = <0 14 0x4>;
+                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0x17928000 0x1000>;
                                status = "disabled";
                        };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index dce0141f371904d1074365c069665f2002fc533e..fbb8655653fb386acb97fcb8cc4d1a9fed2ca5b0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -440,7 +440,7 @@
                reg = <0x38>;
                wakeup-source;
                interrupt-parent = <&tlmm>;
-               interrupts = <125 0x2>;
+               interrupts = <125 IRQ_TYPE_EDGE_FALLING>;
                vdd-supply = <&vreg_l28a_3p0>;
                vcc-i2c-supply = <&vreg_l14a_1p88>;