Skip to content

Commit 704dcce

Browse files
robherringarndb
authored andcommitted
arm64: dts: qcom: Fix interrupt-map cell sizes
The PCI node interrupt-map properties have the wrong size as #address-cells in the interrupt parent are not accounted for. The dtc interrupt_map check catches this, but the warning is off because its dependency, interrupt_provider, is off by default. Signed-off-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
1 parent f02b0f0 commit 704dcce

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

arch/arm64/boot/dts/qcom/ipq6018.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -830,10 +830,10 @@
830830

831831
#interrupt-cells = <1>;
832832
interrupt-map-mask = <0 0 0 0x7>;
833-
interrupt-map = <0 0 0 1 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
834-
<0 0 0 2 &intc 0 78 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
835-
<0 0 0 3 &intc 0 79 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
836-
<0 0 0 4 &intc 0 83 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
833+
interrupt-map = <0 0 0 1 &intc 0 0 0 75 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
834+
<0 0 0 2 &intc 0 0 0 78 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
835+
<0 0 0 3 &intc 0 0 0 79 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
836+
<0 0 0 4 &intc 0 0 0 83 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
837837

838838
clocks = <&gcc GCC_SYS_NOC_PCIE0_AXI_CLK>,
839839
<&gcc GCC_PCIE0_AXI_M_CLK>,

arch/arm64/boot/dts/qcom/ipq8074.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -814,13 +814,13 @@
814814
interrupt-names = "msi";
815815
#interrupt-cells = <1>;
816816
interrupt-map-mask = <0 0 0 0x7>;
817-
interrupt-map = <0 0 0 1 &intc 0 142
817+
interrupt-map = <0 0 0 1 &intc 0 0 142
818818
IRQ_TYPE_LEVEL_HIGH>, /* int_a */
819-
<0 0 0 2 &intc 0 143
819+
<0 0 0 2 &intc 0 0 143
820820
IRQ_TYPE_LEVEL_HIGH>, /* int_b */
821-
<0 0 0 3 &intc 0 144
821+
<0 0 0 3 &intc 0 0 144
822822
IRQ_TYPE_LEVEL_HIGH>, /* int_c */
823-
<0 0 0 4 &intc 0 145
823+
<0 0 0 4 &intc 0 0 145
824824
IRQ_TYPE_LEVEL_HIGH>; /* int_d */
825825

826826
clocks = <&gcc GCC_SYS_NOC_PCIE1_AXI_CLK>,
@@ -876,13 +876,13 @@
876876
interrupt-names = "msi";
877877
#interrupt-cells = <1>;
878878
interrupt-map-mask = <0 0 0 0x7>;
879-
interrupt-map = <0 0 0 1 &intc 0 75
879+
interrupt-map = <0 0 0 1 &intc 0 0 75
880880
IRQ_TYPE_LEVEL_HIGH>, /* int_a */
881-
<0 0 0 2 &intc 0 78
881+
<0 0 0 2 &intc 0 0 78
882882
IRQ_TYPE_LEVEL_HIGH>, /* int_b */
883-
<0 0 0 3 &intc 0 79
883+
<0 0 0 3 &intc 0 0 79
884884
IRQ_TYPE_LEVEL_HIGH>, /* int_c */
885-
<0 0 0 4 &intc 0 83
885+
<0 0 0 4 &intc 0 0 83
886886
IRQ_TYPE_LEVEL_HIGH>; /* int_d */
887887

888888
clocks = <&gcc GCC_SYS_NOC_PCIE0_AXI_CLK>,

0 commit comments

Comments
 (0)