Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9190a7ea authored by Leonard Crestez's avatar Leonard Crestez Committed by Greg Kroah-Hartman
Browse files

Revert "ARM: dts: imx7d: Invert legacy PCI irq mapping" 



[ Upstream commit 538d6e9d597584e80514698e24321645debde78f ]

This reverts commit 1c86c9dd.

That commit followed the reference manual but unfortunately the imx7d
manual is incorrect.

Tested with ath9k pcie card and confirmed internally.

Signed-off-by: default avatarLeonard Crestez <leonard.crestez@nxp.com>
Acked-by: default avatarLucas Stach <l.stach@pengutronix.de>
Fixes: 1c86c9dd ("ARM: dts: imx7d: Invert legacy PCI irq mapping")
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3ddd8e1

arch/arm/boot/dts/imx7d.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -144,10 +144,14 @@ 
		interrupt-names = "msi";

		#interrupt-cells = <1>;

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

		interrupt-map = <0 0 0 1 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 2 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 3 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 4 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;

		/*

		 * Reference manual lists pci irqs incorrectly

		 * Real hardware ordering is same as imx6: D+MSI, C, B, A

		 */

		interrupt-map = <0 0 0 1 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 2 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 3 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 0 4 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clks IMX7D_PCIE_CTRL_ROOT_CLK>,

			 <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>,

			 <&clks IMX7D_PCIE_PHY_ROOT_CLK>;