42c42
< __FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/cambria_gpio.c 277882 2015-01-29 18:08:50Z loos $");
---
> __FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/cambria_gpio.c 277996 2015-01-31 19:32:14Z loos $");
58a59
> #include <dev/gpio/gpiobusvar.h>
81a83
> device_t sc_busdev;
121a124
> static device_t cambria_gpio_get_bus(device_t);
263a267,276
> static device_t
> cambria_gpio_get_bus(device_t dev)
> {
> struct cambria_gpio_softc *sc;
>
> sc = device_get_softc(dev);
>
> return (sc->sc_busdev);
> }
>
441,442c454,458
< device_add_child(dev, "gpioc", -1);
< device_add_child(dev, "gpiobus", -1);
---
> sc->sc_busdev = gpiobus_attach_bus(dev);
> if (sc->sc_busdev == NULL) {
> mtx_destroy(&sc->sc_mtx);
> return (ENXIO);
> }
444c460
< return (bus_generic_attach(dev));
---
> return (0);
454,455c470
< bus_generic_detach(dev);
<
---
> gpiobus_detach_bus(dev);
466a482
> DEVMETHOD(gpio_get_bus, cambria_gpio_get_bus),