powerpc: dts: p1010rdb: fix INTx interrupt issue on P1010RDB-PB

Due to the INTA is shared with the active-low PHY2 interrupt on
P1010RDB-PA board, so configure P1010RDB-PA's INTA with polarity as
active-low, the P1010RDB-PB board is used separately, so configure
P1010RDB-PB's INTA with polarity as active-high.  The INTX in
P1010RDB-PB do not work because of the pcie@0 node fixup will be
overwrited by p1010si-post.dtsi file, so we move the pcie@0 node fixup
to p1010rdb-pb.dts and p1010rdb-pb_36b.dts.

Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240119203911.3143928-2-Frank.Li@nxp.com

diff --git a/arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts b/arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts
index 3a94acbb3c03318bc0a1a4b64667af07e35c4ed1..ce3346d77858f460cbe873948a11186808189017 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts
+++ b/arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts
@@ -29,3 +29,19 @@
 };
 
 /include/ "p1010si-post.dtsi"
+
+&pci0 {
+       pcie@0 {
+               interrupt-map = <
+                       /* IDSEL 0x0 */
+                       /*
+                        *irq[4:5] are active-high
+                        *irq[6:7] are active-low
+                        */
+                       0000 0x0 0x0 0x1 &mpic 0x4 0x2 0x0 0x0
+                       0000 0x0 0x0 0x2 &mpic 0x5 0x2 0x0 0x0
+                       0000 0x0 0x0 0x3 &mpic 0x6 0x1 0x0 0x0
+                       0000 0x0 0x0 0x4 &mpic 0x7 0x1 0x0 0x0
+                       >;
+       };
+};

diff --git a/arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts b/arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts
index 4cf255fedc96e94367da2feefedca3d8203fbd26..83590354f9a098546291e9c73d963b59c90f4175 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts
@@ -56,3 +56,19 @@
 };
 
 /include/ "p1010si-post.dtsi"
+
+&pci0 {
+       pcie@0 {
+               interrupt-map = <
+                       /* IDSEL 0x0 */
+                       /*
+                        *irq[4:5] are active-high
+                        *irq[6:7] are active-low
+                        */
+                       0000 0x0 0x0 0x1 &mpic 0x4 0x2 0x0 0x0
+                       0000 0x0 0x0 0x2 &mpic 0x5 0x2 0x0 0x0
+                       0000 0x0 0x0 0x3 &mpic 0x6 0x1 0x0 0x0
+                       0000 0x0 0x0 0x4 &mpic 0x7 0x1 0x0 0x0
+                       >;
+       };
+};

diff --git a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
index 2ca9cee2ddeb25479be85330d8644a58cdc18d57..ef49a7d6c69dd59694436b80688f80e2927680bf 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
@@ -215,19 +215,3 @@
                phy-connection-type = "sgmii";
        };
 };
-
-&pci0 {
-       pcie@0 {
-               interrupt-map = <
-                       /* IDSEL 0x0 */
-                       /*
-                        *irq[4:5] are active-high
-                        *irq[6:7] are active-low
-                        */
-                       0000 0x0 0x0 0x1 &mpic 0x4 0x2 0x0 0x0
-                       0000 0x0 0x0 0x2 &mpic 0x5 0x2 0x0 0x0
-                       0000 0x0 0x0 0x3 &mpic 0x6 0x1 0x0 0x0
-                       0000 0x0 0x0 0x4 &mpic 0x7 0x1 0x0 0x0
-                       >;
-       };
-};