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

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi 
b/arch/arm/boot/dts/bcm-cygnus.dtsi
index 5f7b465..9d3d9ef 100644
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -264,8 +264,11 @@
                        reg = <0x18012000 0x1000>;
 
                        #interrupt-cells = <1>;
-                       interrupt-map-mask = <0 0 0 0>;
-                       interrupt-map = <0 0 0 0 &gic GIC_SPI 100 
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>;
 
@@ -292,6 +295,14 @@
                                             <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
                        };
+
+                       pcie0_intc: interrupt-controller {
+                               compatible = "brcm,iproc-intc";
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                               interrupt-parent = <&gic>;
+                               interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+                       };
                };
 
                pcie1: pcie@18013000 {
@@ -299,8 +310,11 @@
                        reg = <0x18013000 0x1000>;
 
                        #interrupt-cells = <1>;
-                       interrupt-map-mask = <0 0 0 0>;
-                       interrupt-map = <0 0 0 0 &gic GIC_SPI 106 
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>;
 
@@ -327,6 +341,14 @@
                                             <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
                        };
+
+                       pcie1_intc: interrupt-controller {
+                               compatible = "brcm,iproc-intc";
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                               interrupt-parent = <&gic>;
+                               interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                       };
                };
 
                dma0: dma@18018000 {
-- 
2.7.4

Reply via email to