diff options
| author | loos <loos@FreeBSD.org> | 2014-10-28 18:33:59 +0000 |
|---|---|---|
| committer | loos <loos@FreeBSD.org> | 2014-10-28 18:33:59 +0000 |
| commit | 7dd1b73c3843393e02fb47a35ad7b9bf4dac7c2f (patch) | |
| tree | d80aa712cc7a8f76cb28507a8696a187f0a27495 /sys/arm/xscale | |
| parent | ae007aae20de488c994d204240aa025651e5ca22 (diff) | |
| download | FreeBSD-src-7dd1b73c3843393e02fb47a35ad7b9bf4dac7c2f.zip FreeBSD-src-7dd1b73c3843393e02fb47a35ad7b9bf4dac7c2f.tar.gz | |
Make the GPIO children attach to the first unit available and not only to
unit 0.
It seems that this 'simplification' was copied to all GPIO drivers in tree.
This fix a bug where a GPIO controller could fail to attach its children
(gpioc and gpiobus) if another GPIO driver attach first.
Diffstat (limited to 'sys/arm/xscale')
| -rw-r--r-- | sys/arm/xscale/ixp425/avila_gpio.c | 5 | ||||
| -rw-r--r-- | sys/arm/xscale/ixp425/cambria_gpio.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arm/xscale/ixp425/avila_gpio.c b/sys/arm/xscale/ixp425/avila_gpio.c index 8be9948..48f970d 100644 --- a/sys/arm/xscale/ixp425/avila_gpio.c +++ b/sys/arm/xscale/ixp425/avila_gpio.c @@ -318,8 +318,9 @@ avila_gpio_attach(device_t dev) sc->sc_valid |= 1 << p->pin; } - device_add_child(dev, "gpioc", device_get_unit(dev)); - device_add_child(dev, "gpiobus", device_get_unit(dev)); + device_add_child(dev, "gpioc", -1); + device_add_child(dev, "gpiobus", -1); + return (bus_generic_attach(dev)); #undef N } diff --git a/sys/arm/xscale/ixp425/cambria_gpio.c b/sys/arm/xscale/ixp425/cambria_gpio.c index 18472cd..baa3483 100644 --- a/sys/arm/xscale/ixp425/cambria_gpio.c +++ b/sys/arm/xscale/ixp425/cambria_gpio.c @@ -447,8 +447,9 @@ cambria_gpio_attach(device_t dev) cambria_gpio_pin_setflags(dev, pin, p->flags); } - device_add_child(dev, "gpioc", device_get_unit(dev)); - device_add_child(dev, "gpiobus", device_get_unit(dev)); + device_add_child(dev, "gpioc", -1); + device_add_child(dev, "gpiobus", -1); + return (bus_generic_attach(dev)); } |
