Fix method of naming compatible string to follow

"<manufacturer>,<model>" as described in
http://www.devicetree.org/Device_Tree_Usage

Reviewed by: andrew@
Approved by: gonzo@

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/arm/allwinner/aintc.c b/sys/arm/allwinner/aintc.c
index 9416b9a..bfa35f5 100644
--- a/sys/arm/allwinner/aintc.c
+++ b/sys/arm/allwinner/aintc.c
@@ -97,7 +97,7 @@ static struct a10_aintc_softc *a10_aintc_sc = NULL;
 static int
 a10_aintc_probe(device_t dev)
 {
-	if (!ofw_bus_is_compatible(dev, "a10,aintc"))
+	if (!ofw_bus_is_compatible(dev, "allwinner,sun4i-ic"))
 		return (ENXIO);
 	device_set_desc(dev, "A10 AINTC Interrupt Controller");
 	return (BUS_PROBE_DEFAULT);
diff --git a/sys/arm/allwinner/common.c b/sys/arm/allwinner/common.c
index 0b4e16a..eb49479 100644
--- a/sys/arm/allwinner/common.c
+++ b/sys/arm/allwinner/common.c
@@ -47,7 +47,7 @@ static int
 fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
     int *pol)
 {
-	if (!fdt_is_compatible(node, "a10,aintc"))
+	if (!fdt_is_compatible(node, "allwinner,sun4i-ic"))
 		return (ENXIO);
 
 	*interrupt = fdt32_to_cpu(intr[0]);
diff --git a/sys/arm/allwinner/timer.c b/sys/arm/allwinner/timer.c
index c1a56f3..4da3517 100644
--- a/sys/arm/allwinner/timer.c
+++ b/sys/arm/allwinner/timer.c
@@ -141,7 +141,7 @@ static int
 a10_timer_probe(device_t dev)
 {
 
-	if (!ofw_bus_is_compatible(dev, "a10,timers"))
+	if (!ofw_bus_is_compatible(dev, "allwinner,sun4i-timer"))
 		return (ENXIO);
 
 	device_set_desc(dev, "Allwinner A10 timer");
diff --git a/sys/boot/fdt/dts/cubieboard.dts b/sys/boot/fdt/dts/cubieboard.dts
index 185932c..bbb64a9 100644
--- a/sys/boot/fdt/dts/cubieboard.dts
+++ b/sys/boot/fdt/dts/cubieboard.dts
@@ -29,8 +29,8 @@
 /dts-v1/;
 
 / {
-	model = "cubieboard";
-	compatible = "cubieboard", "allwinner,a10";
+	model = "Cubietech Cubieboard";
+	compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10";
 	#address-cells = <1>;
 	#size-cells = <1>;
 
@@ -54,7 +54,7 @@
 		bus-frequency = <0>;
 
 		AINTC: interrupt-controller@01c20400 {
-			compatible = "a10,aintc";
+			compatible = "allwinner,sun4i-ic";
 			interrupt-controller;
 			#address-cells = <0>;
 			#interrupt-cells = <1>;
@@ -62,7 +62,7 @@
 		};
 
 		timer@01c20c00 {
-			compatible = "a10,timers";
+			compatible = "allwinner,sun4i-timer";
 			reg = <0x01c20c00 0x90>;
 			interrupts = < 22 >;
 			interrupt-parent = <&AINTC>;
@@ -70,14 +70,14 @@
 		};
 
 		usb1: usb@01c1c000 {
-			compatible = "a10,usb-ehci", "usb-ehci";
+			compatible = "allwinner,usb-ehci", "usb-ehci";
 			reg = <0x01c1c000 0x1000>;
 			interrupts = < 40 >;
 			interrupt-parent = <&AINTC>;
 		};
 
 		sata@01c18000 {
-			compatible = "a10,ahci";
+			compatible = "allwinner,ahci";
 			reg = <0x01c18000 0x1000>;
 			interrupts = <56>;
 			interrupt-parent = <&AINTC>;