svn commit: r245900 - in head/sys: arm/allwinner boot/fdt/dts

[Ganbold Tsagaankhuu]

Author: ganbold (doc committer)
Date: Fri Jan 25 07:21:22 2013
New Revision: 245900
URL: http://svnweb.freebsd.org/changeset/base/245900

Log:
  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@

Modified:
  head/sys/arm/allwinner/aintc.c
  head/sys/arm/allwinner/common.c
  head/sys/arm/allwinner/timer.c
  head/sys/boot/fdt/dts/cubieboard.dts

Modified: head/sys/arm/allwinner/aintc.c
==============================================================================
--- head/sys/arm/allwinner/aintc.c	Fri Jan 25 06:27:03 2013	(r245899)
+++ head/sys/arm/allwinner/aintc.c	Fri Jan 25 07:21:22 2013	(r245900)
@@ -97,7 +97,7 @@ static struct a10_aintc_softc *a10_aintc
 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);

Modified: head/sys/arm/allwinner/common.c
==============================================================================
--- head/sys/arm/allwinner/common.c	Fri Jan 25 06:27:03 2013	(r245899)
+++ head/sys/arm/allwinner/common.c	Fri Jan 25 07:21:22 2013	(r245900)
@@ -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]);

Modified: head/sys/arm/allwinner/timer.c
==============================================================================
--- head/sys/arm/allwinner/timer.c	Fri Jan 25 06:27:03 2013	(r245899)
+++ head/sys/arm/allwinner/timer.c	Fri Jan 25 07:21:22 2013	(r245900)
@@ -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");

Modified: head/sys/boot/fdt/dts/cubieboard.dts
==============================================================================
--- head/sys/boot/fdt/dts/cubieboard.dts	Fri Jan 25 06:27:03 2013	(r245899)
+++ head/sys/boot/fdt/dts/cubieboard.dts	Fri Jan 25 07:21:22 2013	(r245900)
@@ -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 at 01c20400 {
-			compatible = "a10,aintc";
+			compatible = "allwinner,sun4i-ic";
 			interrupt-controller;
 			#address-cells = <0>;
 			#interrupt-cells = <1>;
@@ -62,7 +62,7 @@
 		};
 
 		timer at 01c20c00 {
-			compatible = "a10,timers";
+			compatible = "allwinner,sun4i-timer";
 			reg = <0x01c20c00 0x90>;
 			interrupts = < 22 >;
 			interrupt-parent = <&AINTC>;
@@ -70,14 +70,14 @@
 		};
 
 		usb1: usb at 01c1c000 {
-			compatible = "a10,usb-ehci", "usb-ehci";
+			compatible = "allwinner,usb-ehci", "usb-ehci";
 			reg = <0x01c1c000 0x1000>;
 			interrupts = < 40 >;
 			interrupt-parent = <&AINTC>;
 		};
 
 		sata at 01c18000 {
-			compatible = "a10,ahci";
+			compatible = "allwinner,ahci";
 			reg = <0x01c18000 0x1000>;
 			interrupts = <56>;
 			interrupt-parent = <&AINTC>;