| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Mon, 11 Jun 2018 15:47:13 -0700 |
| Subject: ARM: dts: NSP: Fix PCIe controllers interrupt types |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit 403fde644855bc71318c8db65646383e22653b13 ] |
| |
| The interrupts for the PCIe controllers should all be of type |
| IRQ_TYPE_LEVEL_HIGH instead of IRQ_TYPE_NONE. |
| |
| Fixes: d71eb9412088 ("ARM: dts: NSP: Add MSI support on PCI") |
| Fixes: 522199029fdc ("ARM: dts: NSP: Fix PCIE DT issue") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/boot/dts/bcm-nsp.dtsi | 30 +++++++++++++++--------------- |
| 1 file changed, 15 insertions(+), 15 deletions(-) |
| |
| --- a/arch/arm/boot/dts/bcm-nsp.dtsi |
| +++ b/arch/arm/boot/dts/bcm-nsp.dtsi |
| @@ -375,7 +375,7 @@ |
| |
| #interrupt-cells = <1>; |
| interrupt-map-mask = <0 0 0 0>; |
| - interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_NONE>; |
| + interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; |
| |
| linux,pci-domain = <0>; |
| |
| @@ -397,10 +397,10 @@ |
| compatible = "brcm,iproc-msi"; |
| msi-controller; |
| interrupt-parent = <&gic>; |
| - interrupts = <GIC_SPI 127 IRQ_TYPE_NONE>, |
| - <GIC_SPI 128 IRQ_TYPE_NONE>, |
| - <GIC_SPI 129 IRQ_TYPE_NONE>, |
| - <GIC_SPI 130 IRQ_TYPE_NONE>; |
| + interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>; |
| brcm,pcie-msi-inten; |
| }; |
| }; |
| @@ -411,7 +411,7 @@ |
| |
| #interrupt-cells = <1>; |
| interrupt-map-mask = <0 0 0 0>; |
| - interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_NONE>; |
| + interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>; |
| |
| linux,pci-domain = <1>; |
| |
| @@ -433,10 +433,10 @@ |
| compatible = "brcm,iproc-msi"; |
| msi-controller; |
| interrupt-parent = <&gic>; |
| - interrupts = <GIC_SPI 133 IRQ_TYPE_NONE>, |
| - <GIC_SPI 134 IRQ_TYPE_NONE>, |
| - <GIC_SPI 135 IRQ_TYPE_NONE>, |
| - <GIC_SPI 136 IRQ_TYPE_NONE>; |
| + interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>; |
| brcm,pcie-msi-inten; |
| }; |
| }; |
| @@ -447,7 +447,7 @@ |
| |
| #interrupt-cells = <1>; |
| interrupt-map-mask = <0 0 0 0>; |
| - interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_NONE>; |
| + interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; |
| |
| linux,pci-domain = <2>; |
| |
| @@ -469,10 +469,10 @@ |
| compatible = "brcm,iproc-msi"; |
| msi-controller; |
| interrupt-parent = <&gic>; |
| - interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>, |
| - <GIC_SPI 140 IRQ_TYPE_NONE>, |
| - <GIC_SPI 141 IRQ_TYPE_NONE>, |
| - <GIC_SPI 142 IRQ_TYPE_NONE>; |
| + interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>; |
| brcm,pcie-msi-inten; |
| }; |
| }; |