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-hr2.dtsi | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/bcm-hr2.dtsi b/arch/arm/boot/dts/bcm-hr2.dtsi
index e4d4973..eb449d0 100644
--- a/arch/arm/boot/dts/bcm-hr2.dtsi
+++ b/arch/arm/boot/dts/bcm-hr2.dtsi
@@ -299,8 +299,11 @@
                reg = <0x18012000 0x1000>;
 
                #interrupt-cells = <1>;
-               interrupt-map-mask = <0 0 0 0>;
-               interrupt-map = <0 0 0 0 &gic GIC_SPI 186 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>;
 
@@ -328,6 +331,14 @@
                                     <GIC_SPI 185 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 186 IRQ_TYPE_LEVEL_HIGH>;
+               };
        };
 
        pcie1: pcie@18013000 {
@@ -335,8 +346,11 @@
                reg = <0x18013000 0x1000>;
 
                #interrupt-cells = <1>;
-               interrupt-map-mask = <0 0 0 0>;
-               interrupt-map = <0 0 0 0 &gic GIC_SPI 192 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>;
 
@@ -364,5 +378,13 @@
                                     <GIC_SPI 191 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 192 IRQ_TYPE_LEVEL_HIGH>;
+               };
        };
 };
-- 
2.7.4

Reply via email to