浏览代码

powerpc/pq2fads: Update device tree for use with device-tree-aware u-boot.

Add aliases, and correct CS0 offset to match how u-boot
programs it (this was not a problem with cuImage because
the wrapper would reprogram the localbus to match the device
tree).

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Scott Wood 16 年之前
父节点
当前提交
65cc0fa3bd
共有 1 个文件被更改,包括 14 次插入6 次删除
  1. 14 6
      arch/powerpc/boot/dts/pq2fads.dts

+ 14 - 6
arch/powerpc/boot/dts/pq2fads.dts

@@ -17,6 +17,14 @@
 	#address-cells = <1>;
 	#address-cells = <1>;
 	#size-cells = <1>;
 	#size-cells = <1>;
 
 
+	aliases {
+		ethernet0 = &enet0;
+		ethernet1 = &enet1;
+		serial0 = &serial0;
+		serial1 = &serial1;
+		pci0 = &pci0;
+	};
+
 	cpus {
 	cpus {
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 		#size-cells = <0>;
@@ -45,7 +53,7 @@
 		#size-cells = <1>;
 		#size-cells = <1>;
 		reg = <0xf0010100 0x60>;
 		reg = <0xf0010100 0x60>;
 
 
-		ranges = <0x0 0x0 0xfe000000 0x800000
+		ranges = <0x0 0x0 0xff800000 0x800000
 		          0x1 0x0 0xf4500000 0x8000
 		          0x1 0x0 0xf4500000 0x8000
 		          0x8 0x0 0xf8200000 0x8000>;
 		          0x8 0x0 0xf8200000 0x8000>;
 
 
@@ -71,7 +79,7 @@
 		};
 		};
 	};
 	};
 
 
-	pci@f0010800 {
+	pci0: pci@f0010800 {
 		device_type = "pci";
 		device_type = "pci";
 		reg = <0xf0010800 0x10c 0xf00101ac 0x8 0xf00101c4 0x8>;
 		reg = <0xf0010800 0x10c 0xf00101ac 0x8 0xf00101c4 0x8>;
 		compatible = "fsl,mpc8280-pci", "fsl,pq2-pci";
 		compatible = "fsl,mpc8280-pci", "fsl,pq2-pci";
@@ -142,7 +150,7 @@
 				reg = <0x119f0 0x10 0x115f0 0x10>;
 				reg = <0x119f0 0x10 0x115f0 0x10>;
 			};
 			};
 
 
-			serial@11a00 {
+			serial0: serial@11a00 {
 				device_type = "serial";
 				device_type = "serial";
 				compatible = "fsl,mpc8280-scc-uart",
 				compatible = "fsl,mpc8280-scc-uart",
 				             "fsl,cpm2-scc-uart";
 				             "fsl,cpm2-scc-uart";
@@ -153,7 +161,7 @@
 				fsl,cpm-command = <0x800000>;
 				fsl,cpm-command = <0x800000>;
 			};
 			};
 
 
-			serial@11a20 {
+			serial1: serial@11a20 {
 				device_type = "serial";
 				device_type = "serial";
 				compatible = "fsl,mpc8280-scc-uart",
 				compatible = "fsl,mpc8280-scc-uart",
 				             "fsl,cpm2-scc-uart";
 				             "fsl,cpm2-scc-uart";
@@ -164,7 +172,7 @@
 				fsl,cpm-command = <0x4a00000>;
 				fsl,cpm-command = <0x4a00000>;
 			};
 			};
 
 
-			ethernet@11320 {
+			enet0: ethernet@11320 {
 				device_type = "network";
 				device_type = "network";
 				compatible = "fsl,mpc8280-fcc-enet",
 				compatible = "fsl,mpc8280-fcc-enet",
 				             "fsl,cpm2-fcc-enet";
 				             "fsl,cpm2-fcc-enet";
@@ -176,7 +184,7 @@
 				fsl,cpm-command = <0x16200300>;
 				fsl,cpm-command = <0x16200300>;
 			};
 			};
 
 
-			ethernet@11340 {
+			enet1: ethernet@11340 {
 				device_type = "network";
 				device_type = "network";
 				compatible = "fsl,mpc8280-fcc-enet",
 				compatible = "fsl,mpc8280-fcc-enet",
 				             "fsl,cpm2-fcc-enet";
 				             "fsl,cpm2-fcc-enet";