powerpc/dts/fsl: Fix dtc-flagged interrupt errors

mpc8641_hpcn was updated to 4-cell interrupt specifiers, but
PCI interrupt-map was not updated.  It was also missing #interrupt-cells
on the outer PCI buses.

p1020rdb-pc was updated to 4-cell interrupt specifiers, but
the ethernet-phy nodes weren't updated.

mpc832x_rdb had an invalid "interrupts = <0>" on the ethernet-phy nodes.
Besides being the wrong number of cells, 0 is not a valid IPIC interrupt
according to ipic.c.  Presumably it was meant to indicate that these
PHYs are not connected to an interrupt.

Signed-off-by: Scott Wood <oss@buserror.net>

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
index 11bea3e6a43f4eaecd019d3970a3155d549503bd..58ac17496c896e64eb44258064b05de9f8e6581c 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
@@ -169,100 +169,100 @@
                interrupt-map-mask = <0xff00 0 0 7>;
                interrupt-map = <
                        /* IDSEL 0x11 func 0 - PCI slot 1 */
-                       0x8800 0 0 1 &mpic 2 1
-                       0x8800 0 0 2 &mpic 3 1
-                       0x8800 0 0 3 &mpic 4 1
-                       0x8800 0 0 4 &mpic 1 1
+                       0x8800 0 0 1 &mpic 2 1 0 0
+                       0x8800 0 0 2 &mpic 3 1 0 0
+                       0x8800 0 0 3 &mpic 4 1 0 0
+                       0x8800 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 1 - PCI slot 1 */
-                       0x8900 0 0 1 &mpic 2 1
-                       0x8900 0 0 2 &mpic 3 1
-                       0x8900 0 0 3 &mpic 4 1
-                       0x8900 0 0 4 &mpic 1 1
+                       0x8900 0 0 1 &mpic 2 1 0 0
+                       0x8900 0 0 2 &mpic 3 1 0 0
+                       0x8900 0 0 3 &mpic 4 1 0 0
+                       0x8900 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 2 - PCI slot 1 */
-                       0x8a00 0 0 1 &mpic 2 1
-                       0x8a00 0 0 2 &mpic 3 1
-                       0x8a00 0 0 3 &mpic 4 1
-                       0x8a00 0 0 4 &mpic 1 1
+                       0x8a00 0 0 1 &mpic 2 1 0 0
+                       0x8a00 0 0 2 &mpic 3 1 0 0
+                       0x8a00 0 0 3 &mpic 4 1 0 0
+                       0x8a00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 3 - PCI slot 1 */
-                       0x8b00 0 0 1 &mpic 2 1
-                       0x8b00 0 0 2 &mpic 3 1
-                       0x8b00 0 0 3 &mpic 4 1
-                       0x8b00 0 0 4 &mpic 1 1
+                       0x8b00 0 0 1 &mpic 2 1 0 0
+                       0x8b00 0 0 2 &mpic 3 1 0 0
+                       0x8b00 0 0 3 &mpic 4 1 0 0
+                       0x8b00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 4 - PCI slot 1 */
-                       0x8c00 0 0 1 &mpic 2 1
-                       0x8c00 0 0 2 &mpic 3 1
-                       0x8c00 0 0 3 &mpic 4 1
-                       0x8c00 0 0 4 &mpic 1 1
+                       0x8c00 0 0 1 &mpic 2 1 0 0
+                       0x8c00 0 0 2 &mpic 3 1 0 0
+                       0x8c00 0 0 3 &mpic 4 1 0 0
+                       0x8c00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 5 - PCI slot 1 */
-                       0x8d00 0 0 1 &mpic 2 1
-                       0x8d00 0 0 2 &mpic 3 1
-                       0x8d00 0 0 3 &mpic 4 1
-                       0x8d00 0 0 4 &mpic 1 1
+                       0x8d00 0 0 1 &mpic 2 1 0 0
+                       0x8d00 0 0 2 &mpic 3 1 0 0
+                       0x8d00 0 0 3 &mpic 4 1 0 0
+                       0x8d00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 6 - PCI slot 1 */
-                       0x8e00 0 0 1 &mpic 2 1
-                       0x8e00 0 0 2 &mpic 3 1
-                       0x8e00 0 0 3 &mpic 4 1
-                       0x8e00 0 0 4 &mpic 1 1
+                       0x8e00 0 0 1 &mpic 2 1 0 0
+                       0x8e00 0 0 2 &mpic 3 1 0 0
+                       0x8e00 0 0 3 &mpic 4 1 0 0
+                       0x8e00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 7 - PCI slot 1 */
-                       0x8f00 0 0 1 &mpic 2 1
-                       0x8f00 0 0 2 &mpic 3 1
-                       0x8f00 0 0 3 &mpic 4 1
-                       0x8f00 0 0 4 &mpic 1 1
+                       0x8f00 0 0 1 &mpic 2 1 0 0
+                       0x8f00 0 0 2 &mpic 3 1 0 0
+                       0x8f00 0 0 3 &mpic 4 1 0 0
+                       0x8f00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x12 func 0 - PCI slot 2 */
-                       0x9000 0 0 1 &mpic 3 1
-                       0x9000 0 0 2 &mpic 4 1
-                       0x9000 0 0 3 &mpic 1 1
-                       0x9000 0 0 4 &mpic 2 1
+                       0x9000 0 0 1 &mpic 3 1 0 0
+                       0x9000 0 0 2 &mpic 4 1 0 0
+                       0x9000 0 0 3 &mpic 1 1 0 0
+                       0x9000 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 1 - PCI slot 2 */
-                       0x9100 0 0 1 &mpic 3 1
-                       0x9100 0 0 2 &mpic 4 1
-                       0x9100 0 0 3 &mpic 1 1
-                       0x9100 0 0 4 &mpic 2 1
+                       0x9100 0 0 1 &mpic 3 1 0 0
+                       0x9100 0 0 2 &mpic 4 1 0 0
+                       0x9100 0 0 3 &mpic 1 1 0 0
+                       0x9100 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 2 - PCI slot 2 */
-                       0x9200 0 0 1 &mpic 3 1
-                       0x9200 0 0 2 &mpic 4 1
-                       0x9200 0 0 3 &mpic 1 1
-                       0x9200 0 0 4 &mpic 2 1
+                       0x9200 0 0 1 &mpic 3 1 0 0
+                       0x9200 0 0 2 &mpic 4 1 0 0
+                       0x9200 0 0 3 &mpic 1 1 0 0
+                       0x9200 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 3 - PCI slot 2 */
-                       0x9300 0 0 1 &mpic 3 1
-                       0x9300 0 0 2 &mpic 4 1
-                       0x9300 0 0 3 &mpic 1 1
-                       0x9300 0 0 4 &mpic 2 1
+                       0x9300 0 0 1 &mpic 3 1 0 0
+                       0x9300 0 0 2 &mpic 4 1 0 0
+                       0x9300 0 0 3 &mpic 1 1 0 0
+                       0x9300 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 4 - PCI slot 2 */
-                       0x9400 0 0 1 &mpic 3 1
-                       0x9400 0 0 2 &mpic 4 1
-                       0x9400 0 0 3 &mpic 1 1
-                       0x9400 0 0 4 &mpic 2 1
+                       0x9400 0 0 1 &mpic 3 1 0 0
+                       0x9400 0 0 2 &mpic 4 1 0 0
+                       0x9400 0 0 3 &mpic 1 1 0 0
+                       0x9400 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 5 - PCI slot 2 */
-                       0x9500 0 0 1 &mpic 3 1
-                       0x9500 0 0 2 &mpic 4 1
-                       0x9500 0 0 3 &mpic 1 1
-                       0x9500 0 0 4 &mpic 2 1
+                       0x9500 0 0 1 &mpic 3 1 0 0
+                       0x9500 0 0 2 &mpic 4 1 0 0
+                       0x9500 0 0 3 &mpic 1 1 0 0
+                       0x9500 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 6 - PCI slot 2 */
-                       0x9600 0 0 1 &mpic 3 1
-                       0x9600 0 0 2 &mpic 4 1
-                       0x9600 0 0 3 &mpic 1 1
-                       0x9600 0 0 4 &mpic 2 1
+                       0x9600 0 0 1 &mpic 3 1 0 0
+                       0x9600 0 0 2 &mpic 4 1 0 0
+                       0x9600 0 0 3 &mpic 1 1 0 0
+                       0x9600 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 7 - PCI slot 2 */
-                       0x9700 0 0 1 &mpic 3 1
-                       0x9700 0 0 2 &mpic 4 1
-                       0x9700 0 0 3 &mpic 1 1
-                       0x9700 0 0 4 &mpic 2 1
+                       0x9700 0 0 1 &mpic 3 1 0 0
+                       0x9700 0 0 2 &mpic 4 1 0 0
+                       0x9700 0 0 3 &mpic 1 1 0 0
+                       0x9700 0 0 4 &mpic 2 1 0 0
 
                        // IDSEL 0x1c  USB
                        0xe000 0 0 1 &i8259 12 2

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
index 7ff62046a9ea808dc2ce1373b38b1038d7a02762..e64b91e321f612f759c2ae6d1be9e80b9ae15528 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
@@ -136,100 +136,100 @@
                interrupt-map-mask = <0xff00 0 0 7>;
                interrupt-map = <
                        /* IDSEL 0x11 func 0 - PCI slot 1 */
-                       0x8800 0 0 1 &mpic 2 1
-                       0x8800 0 0 2 &mpic 3 1
-                       0x8800 0 0 3 &mpic 4 1
-                       0x8800 0 0 4 &mpic 1 1
+                       0x8800 0 0 1 &mpic 2 1 0 0
+                       0x8800 0 0 2 &mpic 3 1 0 0
+                       0x8800 0 0 3 &mpic 4 1 0 0
+                       0x8800 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 1 - PCI slot 1 */
-                       0x8900 0 0 1 &mpic 2 1
-                       0x8900 0 0 2 &mpic 3 1
-                       0x8900 0 0 3 &mpic 4 1
-                       0x8900 0 0 4 &mpic 1 1
+                       0x8900 0 0 1 &mpic 2 1 0 0
+                       0x8900 0 0 2 &mpic 3 1 0 0
+                       0x8900 0 0 3 &mpic 4 1 0 0
+                       0x8900 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 2 - PCI slot 1 */
-                       0x8a00 0 0 1 &mpic 2 1
-                       0x8a00 0 0 2 &mpic 3 1
-                       0x8a00 0 0 3 &mpic 4 1
-                       0x8a00 0 0 4 &mpic 1 1
+                       0x8a00 0 0 1 &mpic 2 1 0 0
+                       0x8a00 0 0 2 &mpic 3 1 0 0
+                       0x8a00 0 0 3 &mpic 4 1 0 0
+                       0x8a00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 3 - PCI slot 1 */
-                       0x8b00 0 0 1 &mpic 2 1
-                       0x8b00 0 0 2 &mpic 3 1
-                       0x8b00 0 0 3 &mpic 4 1
-                       0x8b00 0 0 4 &mpic 1 1
+                       0x8b00 0 0 1 &mpic 2 1 0 0
+                       0x8b00 0 0 2 &mpic 3 1 0 0
+                       0x8b00 0 0 3 &mpic 4 1 0 0
+                       0x8b00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 4 - PCI slot 1 */
-                       0x8c00 0 0 1 &mpic 2 1
-                       0x8c00 0 0 2 &mpic 3 1
-                       0x8c00 0 0 3 &mpic 4 1
-                       0x8c00 0 0 4 &mpic 1 1
+                       0x8c00 0 0 1 &mpic 2 1 0 0
+                       0x8c00 0 0 2 &mpic 3 1 0 0
+                       0x8c00 0 0 3 &mpic 4 1 0 0
+                       0x8c00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 5 - PCI slot 1 */
-                       0x8d00 0 0 1 &mpic 2 1
-                       0x8d00 0 0 2 &mpic 3 1
-                       0x8d00 0 0 3 &mpic 4 1
-                       0x8d00 0 0 4 &mpic 1 1
+                       0x8d00 0 0 1 &mpic 2 1 0 0
+                       0x8d00 0 0 2 &mpic 3 1 0 0
+                       0x8d00 0 0 3 &mpic 4 1 0 0
+                       0x8d00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 6 - PCI slot 1 */
-                       0x8e00 0 0 1 &mpic 2 1
-                       0x8e00 0 0 2 &mpic 3 1
-                       0x8e00 0 0 3 &mpic 4 1
-                       0x8e00 0 0 4 &mpic 1 1
+                       0x8e00 0 0 1 &mpic 2 1 0 0
+                       0x8e00 0 0 2 &mpic 3 1 0 0
+                       0x8e00 0 0 3 &mpic 4 1 0 0
+                       0x8e00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x11 func 7 - PCI slot 1 */
-                       0x8f00 0 0 1 &mpic 2 1
-                       0x8f00 0 0 2 &mpic 3 1
-                       0x8f00 0 0 3 &mpic 4 1
-                       0x8f00 0 0 4 &mpic 1 1
+                       0x8f00 0 0 1 &mpic 2 1 0 0
+                       0x8f00 0 0 2 &mpic 3 1 0 0
+                       0x8f00 0 0 3 &mpic 4 1 0 0
+                       0x8f00 0 0 4 &mpic 1 1 0 0
 
                        /* IDSEL 0x12 func 0 - PCI slot 2 */
-                       0x9000 0 0 1 &mpic 3 1
-                       0x9000 0 0 2 &mpic 4 1
-                       0x9000 0 0 3 &mpic 1 1
-                       0x9000 0 0 4 &mpic 2 1
+                       0x9000 0 0 1 &mpic 3 1 0 0
+                       0x9000 0 0 2 &mpic 4 1 0 0
+                       0x9000 0 0 3 &mpic 1 1 0 0
+                       0x9000 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 1 - PCI slot 2 */
-                       0x9100 0 0 1 &mpic 3 1
-                       0x9100 0 0 2 &mpic 4 1
-                       0x9100 0 0 3 &mpic 1 1
-                       0x9100 0 0 4 &mpic 2 1
+                       0x9100 0 0 1 &mpic 3 1 0 0
+                       0x9100 0 0 2 &mpic 4 1 0 0
+                       0x9100 0 0 3 &mpic 1 1 0 0
+                       0x9100 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 2 - PCI slot 2 */
-                       0x9200 0 0 1 &mpic 3 1
-                       0x9200 0 0 2 &mpic 4 1
-                       0x9200 0 0 3 &mpic 1 1
-                       0x9200 0 0 4 &mpic 2 1
+                       0x9200 0 0 1 &mpic 3 1 0 0
+                       0x9200 0 0 2 &mpic 4 1 0 0
+                       0x9200 0 0 3 &mpic 1 1 0 0
+                       0x9200 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 3 - PCI slot 2 */
-                       0x9300 0 0 1 &mpic 3 1
-                       0x9300 0 0 2 &mpic 4 1
-                       0x9300 0 0 3 &mpic 1 1
-                       0x9300 0 0 4 &mpic 2 1
+                       0x9300 0 0 1 &mpic 3 1 0 0
+                       0x9300 0 0 2 &mpic 4 1 0 0
+                       0x9300 0 0 3 &mpic 1 1 0 0
+                       0x9300 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 4 - PCI slot 2 */
-                       0x9400 0 0 1 &mpic 3 1
-                       0x9400 0 0 2 &mpic 4 1
-                       0x9400 0 0 3 &mpic 1 1
-                       0x9400 0 0 4 &mpic 2 1
+                       0x9400 0 0 1 &mpic 3 1 0 0
+                       0x9400 0 0 2 &mpic 4 1 0 0
+                       0x9400 0 0 3 &mpic 1 1 0 0
+                       0x9400 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 5 - PCI slot 2 */
-                       0x9500 0 0 1 &mpic 3 1
-                       0x9500 0 0 2 &mpic 4 1
-                       0x9500 0 0 3 &mpic 1 1
-                       0x9500 0 0 4 &mpic 2 1
+                       0x9500 0 0 1 &mpic 3 1 0 0
+                       0x9500 0 0 2 &mpic 4 1 0 0
+                       0x9500 0 0 3 &mpic 1 1 0 0
+                       0x9500 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 6 - PCI slot 2 */
-                       0x9600 0 0 1 &mpic 3 1
-                       0x9600 0 0 2 &mpic 4 1
-                       0x9600 0 0 3 &mpic 1 1
-                       0x9600 0 0 4 &mpic 2 1
+                       0x9600 0 0 1 &mpic 3 1 0 0
+                       0x9600 0 0 2 &mpic 4 1 0 0
+                       0x9600 0 0 3 &mpic 1 1 0 0
+                       0x9600 0 0 4 &mpic 2 1 0 0
 
                        /* IDSEL 0x12 func 7 - PCI slot 2 */
-                       0x9700 0 0 1 &mpic 3 1
-                       0x9700 0 0 2 &mpic 4 1
-                       0x9700 0 0 3 &mpic 1 1
-                       0x9700 0 0 4 &mpic 2 1
+                       0x9700 0 0 1 &mpic 3 1 0 0
+                       0x9700 0 0 2 &mpic 4 1 0 0
+                       0x9700 0 0 3 &mpic 1 1 0 0
+                       0x9700 0 0 4 &mpic 2 1 0 0
 
                        // IDSEL 0x1c  USB
                        0xe000 0 0 1 &i8259 12 2

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
index eeb7c65d5f223ce62601d97c91e1584cc0485617..50039d4fa278bb4051517b6874c75d2626cf3532 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
@@ -97,6 +97,7 @@
 &pci0 {
        compatible = "fsl,mpc8641-pcie";
        device_type = "pci";
+       #interrupt-cells = <1>;
        #size-cells = <2>;
        #address-cells = <3>;
        bus-range = <0x0 0xff>;
@@ -123,6 +124,7 @@
 &pci1 {
        compatible = "fsl,mpc8641-pcie";
        device_type = "pci";
+       #interrupt-cells = <1>;
        #size-cells = <2>;
        #address-cells = <3>;
        bus-range = <0x0 0xff>;

diff --git a/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi b/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
index 25f81eea60e09251a60e824131c48a34f90d2e55..a13876c05c1e29b4a7493fb2ecb3343580a82f84 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
@@ -205,13 +205,13 @@
        mdio@24000 {
                phy0: ethernet-phy@0 {
                        interrupt-parent = <&mpic>;
-                       interrupts = <3 1>;
+                       interrupts = <3 1 0 0>;
                        reg = <0x0>;
                };
 
                phy1: ethernet-phy@1 {
                        interrupt-parent = <&mpic>;
-                       interrupts = <2 1>;
+                       interrupts = <2 1 0 0>;
                        reg = <0x1>;
                };
 

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 647cae14c16dfb8464320af7c621c4b4b4b020ad..be6ef3531b2888c400ef7a8155981b65fb5db2a0 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -311,13 +311,9 @@
                        compatible = "fsl,ucc-mdio";
 
                        phy00:ethernet-phy@0 {
-                               interrupt-parent = <&ipic>;
-                               interrupts = <0>;
                                reg = <0x0>;
                        };
                        phy04:ethernet-phy@4 {
-                               interrupt-parent = <&ipic>;
-                               interrupts = <0>;
                                reg = <0x4>;
                        };
                };