[PATCH v2 4/6] arm: dts: Change PCIe INTx mapping for NSP

[Srinath Mannam]

From: Ray Jui <ray....@broadcom.com>

Change the PCIe INTx mapping to model the 4 INTx interrupts in the
IRQ domain of the iProc PCIe controller itself

Signed-off-by: Ray Jui <ray....@broadcom.com>
Signed-off-by: Srinath Mannam <srinath.man...@broadcom.com>
---
 arch/arm/boot/dts/bcm-nsp.dtsi | 45 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 6925b30..0e28817 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -532,8 +532,11 @@
                reg = <0x18012000 0x1000>;
 
                #interrupt-cells = <1>;
-               interrupt-map-mask = <0 0 0 0>;
-               interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-map-mask = <0 0 0 7>;
+               interrupt-map = <0 0 0 1 &pcie0_intc 1>,
+                               <0 0 0 2 &pcie0_intc 2>,
+                               <0 0 0 3 &pcie0_intc 3>,
+                               <0 0 0 4 &pcie0_intc 4>;
 
                linux,pci-domain = <0>;
 
@@ -562,6 +565,14 @@
                                     <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
                        brcm,pcie-msi-inten;
                };
+
+               pcie0_intc: interrupt-controller {
+                       compatible = "brcm,iproc-intc";
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+                       interrupt-parent = <&gic>;
+                       interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
+               };
        };
 
        pcie1: pcie@18013000 {
@@ -569,8 +580,11 @@
                reg = <0x18013000 0x1000>;
 
                #interrupt-cells = <1>;
-               interrupt-map-mask = <0 0 0 0>;
-               interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-map-mask = <0 0 0 7>;
+               interrupt-map = <0 0 0 1 &pcie1_intc 1>,
+                               <0 0 0 2 &pcie1_intc 2>,
+                               <0 0 0 3 &pcie1_intc 3>,
+                               <0 0 0 4 &pcie1_intc 4>;
 
                linux,pci-domain = <1>;
 
@@ -599,6 +613,14 @@
                                     <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
                        brcm,pcie-msi-inten;
                };
+
+               pcie1_intc: interrupt-controller {
+                       compatible = "brcm,iproc-intc";
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+                       interrupt-parent = <&gic>;
+                       interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
+               };
        };
 
        pcie2: pcie@18014000 {
@@ -606,8 +628,11 @@
                reg = <0x18014000 0x1000>;
 
                #interrupt-cells = <1>;
-               interrupt-map-mask = <0 0 0 0>;
-               interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-map-mask = <0 0 0 7>;
+               interrupt-map = <0 0 0 1 &pcie2_intc 1>,
+                               <0 0 0 2 &pcie2_intc 2>,
+                               <0 0 0 3 &pcie2_intc 3>,
+                               <0 0 0 4 &pcie2_intc 4>;
 
                linux,pci-domain = <2>;
 
@@ -636,6 +661,14 @@
                                     <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;
                        brcm,pcie-msi-inten;
                };
+
+               pcie2_intc: interrupt-controller {
+                       compatible = "brcm,iproc-intc";
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+                       interrupt-parent = <&gic>;
+                       interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+               };
        };
 
        thermal-zones {
-- 
2.7.4