From owner-svn-src-head@FreeBSD.ORG  Fri Jan  3 18:36:19 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 94019B5E;
 Fri,  3 Jan 2014 18:36:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 80F1116C5;
 Fri,  3 Jan 2014 18:36:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03IaJTO086913;
 Fri, 3 Jan 2014 18:36:19 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03IaJAl086912;
 Fri, 3 Jan 2014 18:36:19 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201401031836.s03IaJAl086912@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Fri, 3 Jan 2014 18:36:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260235 - 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jan 2014 18:36:19 -0000

Author: ian
Date: Fri Jan  3 18:36:19 2014
New Revision: 260235
URL: http://svnweb.freebsd.org/changeset/base/260235

Log:
  Update the dockstar DTS to reflect just NAND flash (no SPI NOR flash, and
  the LED specification was just misplaced).  The rather odd memory mappings
  that were in place used an undocumented attribute value (0x0f) that caused
  problems with the system.
  
  Submitted by:	Markus Pfeiffer <markus.pfeiffer@morphism.de>

Modified:
  head/sys/boot/fdt/dts/dockstar.dts

Modified: head/sys/boot/fdt/dts/dockstar.dts
==============================================================================
--- head/sys/boot/fdt/dts/dockstar.dts	Fri Jan  3 18:08:31 2014	(r260234)
+++ head/sys/boot/fdt/dts/dockstar.dts	Fri Jan  3 18:36:19 2014	(r260235)
@@ -76,44 +76,17 @@
 		#size-cells = <1>;
 		compatible = "mrvl,lbc";
 
-		/* This reflects CPU decode windows setup. */
-		ranges = <0x0 0x0f 0xf9300000 0x00100000
-			  0x1 0x1e 0xfa000000 0x00100000
-			  0x2 0x1d 0xfa100000 0x02000000
-			  0x3 0x1b 0xfc100000 0x00000400>;
+		/* This reflects CPU decode windows setup for NAND access. */
+		ranges = <0x0 0x2f 0xf9300000 0x00100000>;
 
-		nor@0,0 {
+		nand@0,0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			compatible = "cfi-flash";
+			compatible = "mrvl,nfc";
 			reg = <0x0 0x0 0x00100000>;
 			bank-width = <2>;
 			device-width = <1>;
 		};
-
-		led@1,0 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			compatible = "led";
-			reg = <0x1 0x0 0x00100000>;
-		};
-
-		nor@2,0 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			compatible = "cfi-flash";
-			reg = <0x2 0x0 0x02000000>;
-			bank-width = <2>;
-			device-width = <1>;
-		};
-
-		nand@3,0 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0x3 0x0 0x00100000>;
-			bank-width = <2>;
-			device-width = <1>;
-		};
 	};
 
 	SOC: soc88f6281@f1000000 {