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>;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to