PERFORCE change 219919 for review

[Robert Watson]

http://p4web.freebsd.org/@@219919?ac=10

Change 219919 by rwatson at rwatson_zenith_cl_cam_ac_uk on 2012/12/30 18:00:19

	Hang Avalon-attached devices off of a simplebus instance for BERI.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#3 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#3 (text+ko) ====

@@ -52,56 +52,62 @@
 		};
 	};
 
-	memory {
-		device_type = "memory";
-		reg = <0x0 0x40000000>;		// 1G at 0x0
-	};
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+
+		memory {
+			device_type = "memory";
+			reg = <0x0 0x40000000>;		// 1G at 0x0
+		};
 
-	serial at 7f000000 {
-		compatible = "altera,jtag_uart-11_0";
-		reg = <0x7f000000 0x40>;
-		interrupts = <0>;
-	};
+		serial at 7f000000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f000000 0x40>;
+			// interrupts = <0>;
+		};
 
-	serial at 7f001000 {
-		compatible = "altera,jtag_uart-11_0";
-		reg = <0x7f001000 0x40>;
-	};
+		serial at 7f001000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f001000 0x40>;
+		};
 
-	serial at 7f002000 {
-		compatible = "altera,jtag_uart-11_0";
-		reg = <0x7f002000 0x40>;
-	};
+		serial at 7f002000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f002000 0x40>;
+		};
 
-	sdcard at 7f008000 {
-		compatible = "altera,sdcard_11_2011";
-		reg = <0x7f008000 0x400>;
-	};
+		sdcard at 7f008000 {
+			compatible = "altera,sdcard_11_2011";
+			reg = <0x7f008000 0x400>;
+		};
 
-	led at 7f006000 {
-		compatible = "cambridge,de4led";
-		reg = <0x7f006000 0x1>;
-	};
+		led at 7f006000 {
+			compatible = "cambridge,de4led";
+			reg = <0x7f006000 0x1>;
+		};
 
-	ethernet at 7f007000 {
-		compatible = "altera,atse";
-		reg = <0x7f007000 0x540>;
-	};
+		ethernet at 7f007000 {
+			compatible = "altera,atse";
+			reg = <0x7f007000 0x540>;
+		};
 
-	touchscreen at 70400000 {
-		compatible = "cambridge,mtl";
-		reg = <0x70400000 0x1000
-		       0x70000000 0x177000
-		       0x70177000 0x2000>;
-	};
+		touchscreen at 70400000 {
+			compatible = "cambridge,mtl";
+			reg = <0x70400000 0x1000
+			       0x70000000 0x177000
+			       0x70177000 0x2000>;
+		};
 
-	flash at 0x74000000 {
-		compatible = "intel,strataflash";
-		reg = <0x74000000 0x2000000>;
-	};
+		flash at 0x74000000 {
+			compatible = "intel,strataflash";
+			reg = <0x74000000 0x2000000>;
+		};
 
-	flash at 0x76000000 {
-		compatible = "intel,strataflash";
-		reg = <0x76000000 0x2000000>;
+		flash at 0x76000000 {
+			compatible = "intel,strataflash";
+			reg = <0x76000000 0x2000000>;
+		};
 	};
 };