From owner-svn-src-head@FreeBSD.ORG  Tue Sep  2 16:38:01 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 3165549A;
 Tue,  2 Sep 2014 16:38:01 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D64611C2;
 Tue,  2 Sep 2014 16:38:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s82Gc0eS030197;
 Tue, 2 Sep 2014 16:38:00 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s82Gc0oC030191;
 Tue, 2 Sep 2014 16:38:00 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201409021638.s82Gc0oC030191@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 2 Sep 2014 16:38:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270971 - head/sys/boot/fdt/dts/arm
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.18-1
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: Tue, 02 Sep 2014 16:38:01 -0000

Author: imp
Date: Tue Sep  2 16:38:00 2014
New Revision: 270971
URL: http://svnweb.freebsd.org/changeset/base/270971

Log:
  The proper compatibility string for the AHCI device is
  allwinner,sun4i-ahci, so use that instead of the older string which
  had become FreeBSD specific.

Modified:
  head/sys/boot/fdt/dts/arm/cubieboard2.dts
  head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
  head/sys/boot/fdt/dts/arm/sun7i-a20.dtsi

Modified: head/sys/boot/fdt/dts/arm/cubieboard2.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/cubieboard2.dts	Tue Sep  2 16:14:16 2014	(r270970)
+++ head/sys/boot/fdt/dts/arm/cubieboard2.dts	Tue Sep  2 16:38:00 2014	(r270971)
@@ -60,6 +60,10 @@
 		emac@01c0b000 {
 			status = "okay";
 		};
+
+		ahci: sata@01c18000 {
+			status = "okay";
+		};
 	};
 
 	chosen {

Modified: head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi	Tue Sep  2 16:14:16 2014	(r270970)
+++ head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi	Tue Sep  2 16:38:00 2014	(r270971)
@@ -104,7 +104,7 @@
 		};
 
 		sata@01c18000 {
-			compatible = "allwinner,ahci";
+			compatible = "allwinner,sun4i-ahci";
 			reg = <0x01c18000 0x1000>;
 			interrupts = <56>;
 			interrupt-parent = <&AINTC>;

Modified: head/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/sun7i-a20.dtsi	Tue Sep  2 16:14:16 2014	(r270970)
+++ head/sys/boot/fdt/dts/arm/sun7i-a20.dtsi	Tue Sep  2 16:38:00 2014	(r270971)
@@ -110,7 +110,7 @@
 		};
 
 		sata@01c18000 {
-			compatible = "allwinner,ahci";
+			compatible = "allwinner,sun4i-a10-ahci";
 			reg = <0x01c18000 0x1000>;
 			interrupts = <56>;
 			interrupt-parent = <&GIC>;