OSDN Git Service

ARM: dts: msm: Fix interrupt type for a few IRQs
authorMitchel Humpherys <mitchelh@codeaurora.org>
Tue, 17 May 2016 00:53:52 +0000 (17:53 -0700)
committerKyle Yan <kyan@codeaurora.org>
Tue, 5 Jul 2016 22:33:29 +0000 (15:33 -0700)
The interrupt types for a few SMMU IRQs are incorrect.  Fix them.

CRs-Fixed: 1037068
Change-Id: Ic45e1ec592bf0503d456ad1029e32dfea5d63bf1
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi

index 41af9b6..97abec7 100644 (file)
                qcom,register-save;
                qcom,skip-init;
                #global-interrupts = <2>;
-               interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 364 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 365 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 366 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>;
+               interrupts = <GIC_SPI 229 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 231 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 364 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 365 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 366 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 367 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 368 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 369 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 370 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 431 IRQ_TYPE_EDGE_RISING>;
                clocks = <&clock_gcc clk_aggre1_noc_clk>;
                clock-names = "smmu_aggre1_noc_clk";
                #clock-cells = <1>;
                qcom,register-save;
                qcom,skip-init;
                #global-interrupts = <2>;
-               interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 463 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
+               interrupts = <GIC_SPI 229 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 231 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 373 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 374 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 375 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 376 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 377 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 378 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 462 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 464 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 465 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 466 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 467 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 353 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 354 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 356 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 357 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 358 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 359 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 360 IRQ_TYPE_EDGE_RISING>;
                clocks = <&clock_gcc clk_aggre2_noc_clk>;
                clock-names = "smmu_aggre2_noc_clk";
                #clock-cells = <1>;
                qcom,register-save;
                qcom,skip-init;
                #global-interrupts = <2>;
-               interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 231 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 116 IRQ_TYPE_LEVEL_HIGH>,
-                          <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
+               interrupts = <GIC_SPI 229 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 231 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 329 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 330 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 331 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 332 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 116 IRQ_TYPE_EDGE_RISING>,
+                          <GIC_SPI 117 IRQ_TYPE_EDGE_RISING>;
                vdd-supply = <&gdsc_gpu_cx>;
                clocks = <&clock_gcc clk_gcc_gpu_cfg_ahb_clk>,
                        <&clock_gcc clk_gcc_bimc_gfx_clk>,