mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-16 15:11:52 +00:00
Code Issues Releases Activity

Fix method of naming compatible string to follow

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

Reviewed by: andrew@
Approved by: gonzo@
This commit is contained in:
Ganbold Tsagaankhuu 2013-01-25 07:21:22 +00:00
parent 1caafc47a3
commit c0c4446155
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=245900
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm/allwinner/aintc.c
View File

@ -97,7 +97,7 @@ static struct a10_aintc_softc *a10_aintc_sc = NULL;
static int static int
a10_aintc_probe(device_t dev) 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); return (ENXIO);
device_set_desc(dev, "A10 AINTC Interrupt Controller"); device_set_desc(dev, "A10 AINTC Interrupt Controller");
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);

2
sys/arm/allwinner/common.c
View File

@ -47,7 +47,7 @@ static int
fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol) int *pol)
{ {
if (!fdt_is_compatible(node, "a10,aintc")) if (!fdt_is_compatible(node, "allwinner,sun4i-ic"))
return (ENXIO); return (ENXIO);
*interrupt = fdt32_to_cpu(intr[0]); *interrupt = fdt32_to_cpu(intr[0]);

2
sys/arm/allwinner/timer.c
View File

@ -141,7 +141,7 @@ static int
a10_timer_probe(device_t dev) 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); return (ENXIO);
device_set_desc(dev, "Allwinner A10 timer"); device_set_desc(dev, "Allwinner A10 timer");

12
sys/boot/fdt/dts/cubieboard.dts
View File

@ -29,8 +29,8 @@
/dts-v1/; /dts-v1/;
/ { / {
model = "cubieboard"; model = "Cubietech Cubieboard";
compatible = "cubieboard", "allwinner,a10"; compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -54,7 +54,7 @@
bus-frequency = <0>; bus-frequency = <0>;
AINTC: interrupt-controller@01c20400 { AINTC: interrupt-controller@01c20400 {
compatible = "a10,aintc"; compatible = "allwinner,sun4i-ic";
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
@ -62,7 +62,7 @@
}; };
timer@01c20c00 { timer@01c20c00 {
compatible = "a10,timers"; compatible = "allwinner,sun4i-timer";
reg = <0x01c20c00 0x90>; reg = <0x01c20c00 0x90>;
interrupts = < 22 >; interrupts = < 22 >;
interrupt-parent = <&AINTC>; interrupt-parent = <&AINTC>;
@ -70,14 +70,14 @@
}; };
usb1: usb@01c1c000 { usb1: usb@01c1c000 {
compatible = "a10,usb-ehci", "usb-ehci"; compatible = "allwinner,usb-ehci", "usb-ehci";
reg = <0x01c1c000 0x1000>; reg = <0x01c1c000 0x1000>;
interrupts = < 40 >; interrupts = < 40 >;
interrupt-parent = <&AINTC>; interrupt-parent = <&AINTC>;
}; };
sata@01c18000 { sata@01c18000 {
compatible = "a10,ahci"; compatible = "allwinner,ahci";
reg = <0x01c18000 0x1000>; reg = <0x01c18000 0x1000>;
interrupts = <56>; interrupts = <56>;
interrupt-parent = <&AINTC>; interrupt-parent = <&AINTC>;