From owner-svn-src-all@FreeBSD.ORG  Fri Nov 23 03:24:53 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7D231DD9;
 Fri, 23 Nov 2012 03:24:53 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4881D8FC14;
 Fri, 23 Nov 2012 03:24:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAN3OrXH026758;
 Fri, 23 Nov 2012 03:24:53 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAN3OreT026757;
 Fri, 23 Nov 2012 03:24:53 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201211230324.qAN3OreT026757@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 23 Nov 2012 03:24:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243420 - head/sys/boot/fdt/dts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Nov 2012 03:24:53 -0000

Author: gonzo
Date: Fri Nov 23 03:24:52 2012
New Revision: 243420
URL: http://svnweb.freebsd.org/changeset/base/243420

Log:
  Make FDT blob compatible with Raspberry Pi firmware.
  
  Rasperry Pi firmware has a set of hardcoded pathes it uses to fill
  FDT with system-specific information like display resolution, memory
  size, UART and SDHCI clocks, ethernet MAC address. Handle two of them:
  
  - Add placeholder for ethernet MAC address
  - Move display node out of "axi" node

Modified:
  head/sys/boot/fdt/dts/bcm2835-rpi-b.dts

Modified: head/sys/boot/fdt/dts/bcm2835-rpi-b.dts
==============================================================================
--- head/sys/boot/fdt/dts/bcm2835-rpi-b.dts	Fri Nov 23 01:48:31 2012	(r243419)
+++ head/sys/boot/fdt/dts/bcm2835-rpi-b.dts	Fri Nov 23 03:24:52 2012	(r243420)
@@ -478,26 +478,37 @@
 			interrupt-parent = <&intc>;
 			#address-cells = <1>;
 			#size-cells = <0>;
+			hub {
+				compatible = "usb,hub", "usb,device";
+				reg = <0x00000001>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				ethernet {
+					compatible = "net,ethernet", "usb,device";
+					reg = <0x00000001>;
+					mac-address = [00 00 00 00 00 00];
+				};
+			};
 		};
 
-		display {
-			compatible = "broadcom,bcm2835-fb", "broadcom,bcm2708-fb";
-
-			broadcom,vc-mailbox = <&vc_mbox>;
-			broadcom,vc-channel = <1>;
-
-			broadcom,width = <0>;		/* Set by VideoCore */
-			broadcom,height = <0>;		/* Set by VideoCore */
-			broadcom,depth = <0>;		/* Set by VideoCore */
-		};
 	};
 
-
 	memory {
 		device_type = "memory";
 		reg = <0 0x08000000>; /* 128MB */
 	};
 
+	display {
+		compatible = "broadcom,bcm2835-fb", "broadcom,bcm2708-fb";
+
+		broadcom,vc-mailbox = <&vc_mbox>;
+		broadcom,vc-channel = <1>;
+
+		broadcom,width = <0>;		/* Set by VideoCore */
+		broadcom,height = <0>;		/* Set by VideoCore */
+		broadcom,depth = <0>;		/* Set by VideoCore */
+	};
+
 	leds {
 		compatible = "gpio-leds";