3.18-stable patches

added patches:
	arm-dts-imx6sx-fix-irq-for-pcie-bridge.patch

diff --git a/queue-3.18/arm-dts-imx6sx-fix-irq-for-pcie-bridge.patch b/queue-3.18/arm-dts-imx6sx-fix-irq-for-pcie-bridge.patch
new file mode 100644 (file)
index 0000000..802d2b8
--- /dev/null
+++ b/queue-3.18/arm-dts-imx6sx-fix-irq-for-pcie-bridge.patch
@@ -0,0 +1,36 @@
+From 1bcfe0564044be578841744faea1c2f46adc8178 Mon Sep 17 00:00:00 2001
+From: Oleksij Rempel <o.rempel@pengutronix.de>
+Date: Fri, 15 Jun 2018 09:41:29 +0200
+Subject: ARM: dts: imx6sx: fix irq for pcie bridge
+
+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>
+Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/imx6sx.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/imx6sx.dtsi
++++ b/arch/arm/boot/dts/imx6sx.dtsi
+@@ -1202,7 +1202,7 @@
+                                 /* non-prefetchable memory */
+                                 0x82000000 0 0x08000000 0x08000000 0 0x00f00000>;
+                       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>,

diff --git a/queue-3.18/series b/queue-3.18/series
index 0bf6ebb443b7cf5530d41d8b8c7be4e6a6929770..d7304178c05c35483d9ab91c82889aa29824d69f 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -2,3 +2,4 @@ xen-netfront-don-t-cache-skb_shinfo.patch
 root-dentries-need-rcu-delayed-freeing.patch
 fix-mntput-mntput-race.patch
 fix-__legitimize_mnt-mntput-race.patch
+arm-dts-imx6sx-fix-irq-for-pcie-bridge.patch