summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-09-02 16:38:00 +0000
committerimp <imp@FreeBSD.org>2014-09-02 16:38:00 +0000
commitf8f533c3d28fb5578f62e84c55590966f8fe83b6 (patch)
treef7f3de43d19088281c7ee591dcb21051bf2b345e
parent2a766477ec816475821f4c92c496f21c4fcc93d6 (diff)
downloadFreeBSD-src-f8f533c3d28fb5578f62e84c55590966f8fe83b6.zip
FreeBSD-src-f8f533c3d28fb5578f62e84c55590966f8fe83b6.tar.gz
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.
-rw-r--r--sys/boot/fdt/dts/arm/cubieboard2.dts4
-rw-r--r--sys/boot/fdt/dts/arm/sun4i-a10.dtsi2
-rw-r--r--sys/boot/fdt/dts/arm/sun7i-a20.dtsi2
3 files changed, 6 insertions, 2 deletions
diff --git a/sys/boot/fdt/dts/arm/cubieboard2.dts b/sys/boot/fdt/dts/arm/cubieboard2.dts
index 08d0245..ce0081e 100644
--- a/sys/boot/fdt/dts/arm/cubieboard2.dts
+++ b/sys/boot/fdt/dts/arm/cubieboard2.dts
@@ -60,6 +60,10 @@
emac@01c0b000 {
status = "okay";
};
+
+ ahci: sata@01c18000 {
+ status = "okay";
+ };
};
chosen {
diff --git a/sys/boot/fdt/dts/arm/sun4i-a10.dtsi b/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
index 7ee968a..09eebaa 100644
--- a/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
+++ b/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
@@ -104,7 +104,7 @@
};
sata@01c18000 {
- compatible = "allwinner,ahci";
+ compatible = "allwinner,sun4i-ahci";
reg = <0x01c18000 0x1000>;
interrupts = <56>;
interrupt-parent = <&AINTC>;
diff --git a/sys/boot/fdt/dts/arm/sun7i-a20.dtsi b/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
index 3bbc59f..ab4ef1e 100644
--- a/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
+++ b/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
@@ -110,7 +110,7 @@
};
sata@01c18000 {
- compatible = "allwinner,ahci";
+ compatible = "allwinner,sun4i-a10-ahci";
reg = <0x01c18000 0x1000>;
interrupts = <56>;
interrupt-parent = <&GIC>;
OpenPOWER on IntegriCloud