Unverified Commit 704dccec authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

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: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20240213-arm-dt-cleanups-v1-5-f2dee1292525@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f02b0f0d

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

+4 −4
Original line number Diff line number Diff line
@@ -830,10 +830,10 @@ pcie0: pcie@20000000 { 


			#interrupt-cells = <1>;

			interrupt-map-mask = <0 0 0 0x7>;

			interrupt-map = <0 0 0 1 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>, /* int_a */

					<0 0 0 2 &intc 0 78 IRQ_TYPE_LEVEL_HIGH>, /* int_b */

					<0 0 0 3 &intc 0 79 IRQ_TYPE_LEVEL_HIGH>, /* int_c */

					<0 0 0 4 &intc 0 83 IRQ_TYPE_LEVEL_HIGH>; /* int_d */

			interrupt-map = <0 0 0 1 &intc 0 0 0 75 IRQ_TYPE_LEVEL_HIGH>, /* int_a */

					<0 0 0 2 &intc 0 0 0 78 IRQ_TYPE_LEVEL_HIGH>, /* int_b */

					<0 0 0 3 &intc 0 0 0 79 IRQ_TYPE_LEVEL_HIGH>, /* int_c */

					<0 0 0 4 &intc 0 0 0 83 IRQ_TYPE_LEVEL_HIGH>; /* int_d */



			clocks = <&gcc GCC_SYS_NOC_PCIE0_AXI_CLK>,

				 <&gcc GCC_PCIE0_AXI_M_CLK>,

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

+8 −8
Original line number Diff line number Diff line
@@ -814,13 +814,13 @@ pcie1: pcie@10000000 { 
			interrupt-names = "msi";

			#interrupt-cells = <1>;

			interrupt-map-mask = <0 0 0 0x7>;

			interrupt-map = <0 0 0 1 &intc 0 142

			interrupt-map = <0 0 0 1 &intc 0 0 142

					 IRQ_TYPE_LEVEL_HIGH>, /* int_a */

					<0 0 0 2 &intc 0 143

					<0 0 0 2 &intc 0 0 143

					 IRQ_TYPE_LEVEL_HIGH>, /* int_b */

					<0 0 0 3 &intc 0 144

					<0 0 0 3 &intc 0 0 144

					 IRQ_TYPE_LEVEL_HIGH>, /* int_c */

					<0 0 0 4 &intc 0 145

					<0 0 0 4 &intc 0 0 145

					 IRQ_TYPE_LEVEL_HIGH>; /* int_d */



			clocks = <&gcc GCC_SYS_NOC_PCIE1_AXI_CLK>,
@@ -876,13 +876,13 @@ pcie0: pcie@20000000 { 
			interrupt-names = "msi";

			#interrupt-cells = <1>;

			interrupt-map-mask = <0 0 0 0x7>;

			interrupt-map = <0 0 0 1 &intc 0 75

			interrupt-map = <0 0 0 1 &intc 0 0 75

					 IRQ_TYPE_LEVEL_HIGH>, /* int_a */

					<0 0 0 2 &intc 0 78

					<0 0 0 2 &intc 0 0 78

					 IRQ_TYPE_LEVEL_HIGH>, /* int_b */

					<0 0 0 3 &intc 0 79

					<0 0 0 3 &intc 0 0 79

					 IRQ_TYPE_LEVEL_HIGH>, /* int_c */

					<0 0 0 4 &intc 0 83

					<0 0 0 4 &intc 0 0 83

					 IRQ_TYPE_LEVEL_HIGH>; /* int_d */



			clocks = <&gcc GCC_SYS_NOC_PCIE0_AXI_CLK>,