[for-4.14.y,5/5] ARM: dts: imx6sx: fix irq for pcie bridge

Message ID 1533042142-8681-5-git-send-email-amit.pundir@linaro.org
State New
Headers show
Series
  • [for-4.14.y,1/5] mtd: nand: qcom: Add a NULL check for devm_kasprintf()
Related show

Commit Message

Amit Pundir July 31, 2018, 1:02 p.m.
From: Oleksij Rempel <o.rempel@pengutronix.de>


commit 1bcfe0564044be578841744faea1c2f46adc8178 upstream.

Use the correct IRQ line for the MSI controller in the PCIe host
controller. Apparently a different IRQ line is used compared to other
i.MX6 variants. Without this change MSI IRQs aren't properly propagated
to the upstream interrupt controller.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>

Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

Fixes: b1d17f68e5c5 ("ARM: dts: imx: add initial imx6sx device tree source")
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

[AmitP: Rebased for Stable]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

---
Please cherry-pick it on 4.9.y, 4.4.y and 3.18.y as well.

 arch/arm/boot/dts/imx6sx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

Comments

Greg KH Aug. 13, 2018, 5:20 p.m. | #1
On Tue, Jul 31, 2018 at 06:32:21PM +0530, Amit Pundir wrote:
> From: Oleksij Rempel <o.rempel@pengutronix.de>

> 

> commit 1bcfe0564044be578841744faea1c2f46adc8178 upstream.

> 

> Use the correct IRQ line for the MSI controller in the PCIe host

> controller. Apparently a different IRQ line is used compared to other

> i.MX6 variants. Without this change MSI IRQs aren't properly propagated

> to the upstream interrupt controller.

> 

> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>

> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

> Fixes: b1d17f68e5c5 ("ARM: dts: imx: add initial imx6sx device tree source")

> Signed-off-by: Shawn Guo <shawnguo@kernel.org>

> [AmitP: Rebased for Stable]

> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

> ---

> Please cherry-pick it on 4.9.y, 4.4.y and 3.18.y as well.


You forgot about 4.17 :)

Patch

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 6c7eb54be9e2..d64438bfa68b 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1305,7 +1305,7 @@ 
 				  0x82000000 0 0x08000000 0x08000000 0 0x00f00000>;
 			bus-range = <0x00 0xff>;
 			num-lanes = <1>;
-			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clks IMX6SX_CLK_PCIE_REF_125M>,
 				 <&clks IMX6SX_CLK_PCIE_AXI>,
 				 <&clks IMX6SX_CLK_LVDS1_OUT>,