svn commit: r262725 - in head/sys/boot/fdt/dts: arm mips

[Warner Losh]

Author: imp
Date: Tue Mar  4 03:19:26 2014
New Revision: 262725
URL: http://svnweb.freebsd.org/changeset/base/262725

Log:
  Fix syntax errors and warnings emitted by the GPL dtc.

Modified:
  head/sys/boot/fdt/dts/arm/imx53-qsb.dts
  head/sys/boot/fdt/dts/arm/imx53x.dtsi
  head/sys/boot/fdt/dts/arm/rk3188.dtsi
  head/sys/boot/fdt/dts/arm/rpi.dts
  head/sys/boot/fdt/dts/mips/beri-netfpga.dts
  head/sys/boot/fdt/dts/mips/beri-sim.dts
  head/sys/boot/fdt/dts/mips/beripad-de4.dts

Modified: head/sys/boot/fdt/dts/arm/imx53-qsb.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/imx53-qsb.dts	Tue Mar  4 03:14:09 2014	(r262724)
+++ head/sys/boot/fdt/dts/arm/imx53-qsb.dts	Tue Mar  4 03:19:26 2014	(r262725)
@@ -105,7 +105,7 @@
 			ethernet at 63fec000 {
 				status = "okay";
 				phy-mode = "rmii";
-			}
+			};
 			i2c at 63fc4000 {
 				status = "okay";
 			};

Modified: head/sys/boot/fdt/dts/arm/imx53x.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/imx53x.dtsi	Tue Mar  4 03:14:09 2014	(r262724)
+++ head/sys/boot/fdt/dts/arm/imx53x.dtsi	Tue Mar  4 03:19:26 2014	(r262725)
@@ -95,7 +95,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
     		interrupt-parent = <&tzic>;
-		ranges = <0x50000000 0x14000000>;
+		ranges = <0x0 0x50000000 0x14000000>;
 
 		aips at 50000000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";

Modified: head/sys/boot/fdt/dts/arm/rk3188.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/rk3188.dtsi	Tue Mar  4 03:14:09 2014	(r262724)
+++ head/sys/boot/fdt/dts/arm/rk3188.dtsi	Tue Mar  4 03:19:26 2014	(r262725)
@@ -77,7 +77,6 @@
 
 		timer at 20038000 {
 			compatible = "rockchip,rk30xx-timer";
-			compatible = "rockchip,rk3188-dw-apb-timer-osc";
 			reg = <0x20038000 0x20>;
 			interrupts = <76>;
 			clock-frequency = <24000000>;

Modified: head/sys/boot/fdt/dts/arm/rpi.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/rpi.dts	Tue Mar  4 03:14:09 2014	(r262724)
+++ head/sys/boot/fdt/dts/arm/rpi.dts	Tue Mar  4 03:19:26 2014	(r262725)
@@ -28,13 +28,13 @@
 
 /include/ "bcm2835.dtsi"
 
-/memreserve/ 0x08000000 0x08000000;	/* Set by VideoCore */
-
 / {
 	model = "Raspberry Pi (BCM2835)";
 	compatible = "raspberrypi,model-a", "raspberrypi,model-b", 
 		     "broadcom,bcm2835-vc", "broadcom,bcm2708-vc";
 
+	memreserve = <0x08000000 0x08000000>;	/* Set by VideoCore */
+
 	memory {
 		device_type = "memory";
 		reg = <0 0x8000000>; /* 128MB, Set by VideoCore */

Modified: head/sys/boot/fdt/dts/mips/beri-netfpga.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beri-netfpga.dts	Tue Mar  4 03:14:09 2014	(r262724)
+++ head/sys/boot/fdt/dts/mips/beri-netfpga.dts	Tue Mar  4 03:19:26 2014	(r262725)
@@ -66,7 +66,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <0>;
+			reg = <0 1>;
 			status = "okay";
 		};
 
@@ -75,7 +75,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <1>;
+			reg = <1 1>;
 			// XXX: should we need cached prefix?
 			cpu-release-addr = <0xffffffff 0x800fffe0>;
 		};

Modified: head/sys/boot/fdt/dts/mips/beri-sim.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beri-sim.dts	Tue Mar  4 03:14:09 2014	(r262724)
+++ head/sys/boot/fdt/dts/mips/beri-sim.dts	Tue Mar  4 03:19:26 2014	(r262725)
@@ -64,7 +64,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <0>;
+			reg = <0 1>;
 			status = "okay";
 		};
 
@@ -73,7 +73,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <1>;
+			reg = <1 1>;
 			// XXX: should we need cached prefix?
 			cpu-release-addr = <0xffffffff 0x800fffe0>;
 		};

Modified: head/sys/boot/fdt/dts/mips/beripad-de4.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beripad-de4.dts	Tue Mar  4 03:14:09 2014	(r262724)
+++ head/sys/boot/fdt/dts/mips/beripad-de4.dts	Tue Mar  4 03:19:26 2014	(r262725)
@@ -64,7 +64,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <0>;
+			reg = <0 1>;
 			status = "okay";
 		};
 
@@ -73,7 +73,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <1>;
+			reg = <1 1>;
 			// XXX: should we need cached prefix?
 			cpu-release-addr = <0xffffffff 0x800fffe0>;
 		};