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

Commit db553505 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-4.2-3' of... 

Merge tag 'imx-fixes-4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

The i.MX fixes for 4.2, 3rd round:
 - Fix i.MX6 PCIe interrupt routing which gets missed from stacked IRQ
   domain conversion.  The PCIe wakeup support is currently broken
   because of this.

* tag 'imx-fixes-4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx6: correct i.MX6 PCIe interrupt routing

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 07616f01 1a9fa190

arch/arm/boot/dts/imx6qdl.dtsi

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

			#interrupt-cells = <1>;

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

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

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

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

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

			interrupt-map = <0 0 0 1 &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 4 &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clks IMX6QDL_CLK_PCIE_AXI>,

				 <&clks IMX6QDL_CLK_LVDS1_GATE>,

				 <&clks IMX6QDL_CLK_PCIE_REF_125M>;