lkml.org 
[lkml]   [2018]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 45/56] Revert "ARM: dts: imx7d: Invert legacy PCI irq mapping"
    Date
    From: Leonard Crestez <leonard.crestez@nxp.com>

    [ Upstream commit 538d6e9d597584e80514698e24321645debde78f ]

    This reverts commit 1c86c9dd82f859b474474a7fee0d5195da2c9c1d.

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

    Tested with ath9k pcie card and confirmed internally.

    Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
    Acked-by: Lucas Stach <l.stach@pengutronix.de>
    Fixes: 1c86c9dd82f8 ("ARM: dts: imx7d: Invert legacy PCI irq mapping")
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    arch/arm/boot/dts/imx7d.dtsi | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
    index 8d3d123d0a5c..37f0a5afe348 100644
    --- a/arch/arm/boot/dts/imx7d.dtsi
    +++ b/arch/arm/boot/dts/imx7d.dtsi
    @@ -125,10 +125,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>;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-20 05:19    [W:4.211 / U:1.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site