Przeglądaj źródła

powerpc/85xx: Fix KSI8560 .dts

Rename MPIC label to mpic to match all other 85xx .dts and to fix compile
issue introduced by addition of the DMA node.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala 17 lat temu
rodzic
commit
0fe9b1ea60
1 zmienionych plików z 10 dodań i 10 usunięć
  1. 10 10
      arch/powerpc/boot/dts/ksi8560.dts

+ 10 - 10
arch/powerpc/boot/dts/ksi8560.dts

@@ -59,7 +59,7 @@
 		memory-controller@2000 {
 		memory-controller@2000 {
 			compatible = "fsl,8540-memory-controller";
 			compatible = "fsl,8540-memory-controller";
 			reg = <0x2000 0x1000>;
 			reg = <0x2000 0x1000>;
-			interrupt-parent = <&MPIC>;
+			interrupt-parent = <&mpic>;
 			interrupts = <0x12 0x2>;
 			interrupts = <0x12 0x2>;
 		};
 		};
 
 
@@ -68,7 +68,7 @@
 			reg = <0x20000 0x1000>;
 			reg = <0x20000 0x1000>;
 			cache-line-size = <0x20>;		/* 32 bytes */
 			cache-line-size = <0x20>;		/* 32 bytes */
 			cache-size = <0x40000>;			/* L2, 256K */
 			cache-size = <0x40000>;			/* L2, 256K */
-			interrupt-parent = <&MPIC>;
+			interrupt-parent = <&mpic>;
 			interrupts = <0x10 0x2>;
 			interrupts = <0x10 0x2>;
 		};
 		};
 
 
@@ -79,7 +79,7 @@
 			compatible = "fsl-i2c";
 			compatible = "fsl-i2c";
 			reg = <0x3000 0x100>;
 			reg = <0x3000 0x100>;
 			interrupts = <0x2b 0x2>;
 			interrupts = <0x2b 0x2>;
-			interrupt-parent = <&MPIC>;
+			interrupt-parent = <&mpic>;
 			dfsrr;
 			dfsrr;
 		};
 		};
 
 
@@ -131,13 +131,13 @@
 			reg = <0x24520 0x20>;
 			reg = <0x24520 0x20>;
 
 
 			PHY1: ethernet-phy@1 {
 			PHY1: ethernet-phy@1 {
-				interrupt-parent = <&MPIC>;
+				interrupt-parent = <&mpic>;
 				reg = <0x1>;
 				reg = <0x1>;
 				device_type = "ethernet-phy";
 				device_type = "ethernet-phy";
 			};
 			};
 
 
 			PHY2: ethernet-phy@2 {
 			PHY2: ethernet-phy@2 {
-				interrupt-parent = <&MPIC>;
+				interrupt-parent = <&mpic>;
 				reg = <0x2>;
 				reg = <0x2>;
 				device_type = "ethernet-phy";
 				device_type = "ethernet-phy";
 			};
 			};
@@ -151,7 +151,7 @@
 			/* Mac address filled in by bootwrapper */
 			/* Mac address filled in by bootwrapper */
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
 			interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
-			interrupt-parent = <&MPIC>;
+			interrupt-parent = <&mpic>;
 			phy-handle = <&PHY1>;
 			phy-handle = <&PHY1>;
 		};
 		};
 
 
@@ -163,11 +163,11 @@
 			/* Mac address filled in by bootwrapper */
 			/* Mac address filled in by bootwrapper */
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
 			interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
-			interrupt-parent = <&MPIC>;
+			interrupt-parent = <&mpic>;
 			phy-handle = <&PHY2>;
 			phy-handle = <&PHY2>;
 		};
 		};
 
 
-		MPIC: pic@40000 {
+		mpic: pic@40000 {
 			#address-cells = <0>;
 			#address-cells = <0>;
 			#interrupt-cells = <2>;
 			#interrupt-cells = <2>;
 			interrupt-controller;
 			interrupt-controller;
@@ -206,7 +206,7 @@
 				#interrupt-cells = <2>;
 				#interrupt-cells = <2>;
 				interrupt-controller;
 				interrupt-controller;
 				interrupts = <0x2e 0x2>;
 				interrupts = <0x2e 0x2>;
-				interrupt-parent = <&MPIC>;
+				interrupt-parent = <&mpic>;
 				reg = <0x90c00 0x80>;
 				reg = <0x90c00 0x80>;
 				compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
 				compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
 			};
 			};
@@ -244,7 +244,7 @@
 				fsl,mdc-pin = <25>;
 				fsl,mdc-pin = <25>;
 
 
 				PHY0: ethernet-phy@0 {
 				PHY0: ethernet-phy@0 {
-					interrupt-parent = <&MPIC>;
+					interrupt-parent = <&mpic>;
 					reg = <0x0>;
 					reg = <0x0>;
 					device_type = "ethernet-phy";
 					device_type = "ethernet-phy";
 				};
 				};