diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-11-19 16:05:55 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-11-19 16:05:55 +0000 |
| commit | 67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d (patch) | |
| tree | 7d222a83de8d7e5d1465e33f3c24660799770c92 /sys/arm/ti/omap4/omap4_gpio.c | |
| parent | 2828dafcf3e7b225b70cbb380eb8c7dae452493e (diff) | |
| parent | 57b28934e964b15f1fcd91734c6dbef762222079 (diff) | |
| download | src-67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d.tar.gz src-67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d.zip | |
Merge ^/head r308491 through r308841.
Notes
Notes:
svn path=/projects/clang390-import/; revision=308842
Diffstat (limited to 'sys/arm/ti/omap4/omap4_gpio.c')
| -rw-r--r-- | sys/arm/ti/omap4/omap4_gpio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arm/ti/omap4/omap4_gpio.c b/sys/arm/ti/omap4/omap4_gpio.c index dd38f4a6a56a..faf2339411b6 100644 --- a/sys/arm/ti/omap4/omap4_gpio.c +++ b/sys/arm/ti/omap4/omap4_gpio.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/intr.h> -#include <dev/fdt/fdt_common.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> @@ -60,14 +59,14 @@ static struct ofw_compat_data compat_data[] = { static int omap4_gpio_probe(device_t dev) { - if (ti_chip() != CHIP_OMAP_4) - return (ENXIO); if (!ofw_bus_status_okay(dev)) return (ENXIO); if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); + if (ti_chip() != CHIP_OMAP_4) + return (ENXIO); device_set_desc(dev, "TI OMAP4 General Purpose I/O (GPIO)"); |