diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-03-20 03:58:00 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-03-20 03:58:00 +0000 |
| commit | abd90d1ee08cd373bdd48195a0d5718dc92e49ba (patch) | |
| tree | 777b49d8d3993c0c44f8e85f90361e9760de0279 /sys/powerpc | |
| parent | 08f20b36f786045db17ff89e5cc2ea44c767230e (diff) | |
| download | FreeBSD-src-abd90d1ee08cd373bdd48195a0d5718dc92e49ba.zip FreeBSD-src-abd90d1ee08cd373bdd48195a0d5718dc92e49ba.tar.gz | |
Let unin(4) attach to U3 controllers found on G5 machines.
Submitted by: Andreas Tobler
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/powermac/uninorth.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c index d9de1af..fb3c990 100644 --- a/sys/powerpc/powermac/uninorth.c +++ b/sys/powerpc/powermac/uninorth.c @@ -611,7 +611,7 @@ unin_chip_probe(device_t dev) if (name == NULL) return (ENXIO); - if (strcmp(name, "uni-n") != 0) + if (strcmp(name, "uni-n") != 0 && strcmp(name, "u3") != 0) return (ENXIO); device_set_desc(dev, "Apple UniNorth System Controller"); @@ -622,7 +622,8 @@ static int unin_chip_attach(device_t dev) { phandle_t node; - u_int reg[2]; + u_int reg[3]; + int i = 0; uncsc = device_get_softc(dev); node = ofw_bus_get_node(dev); @@ -630,14 +631,18 @@ unin_chip_attach(device_t dev) if (OF_getprop(node, "reg", reg, sizeof(reg)) < 8) return (ENXIO); - uncsc->sc_physaddr = reg[0]; - uncsc->sc_size = reg[1]; + if (strcmp(ofw_bus_get_name(dev), "u3") == 0) + i = 1; /* #address-cells lies */ + + uncsc->sc_physaddr = reg[i]; + uncsc->sc_size = reg[i+1]; /* * Only map the first page, since that is where the registers * of interest lie. */ - uncsc->sc_addr = (vm_offset_t) pmap_mapdev(reg[0], PAGE_SIZE); + uncsc->sc_addr = (vm_offset_t) pmap_mapdev(uncsc->sc_physaddr, + PAGE_SIZE); uncsc->sc_version = *(u_int *)uncsc->sc_addr; device_printf(dev, "Version %d\n", uncsc->sc_version); |
