svn commit: r290422 - head/sys/arm/at91
Olivier Houchard
cognet at FreeBSD.org
Thu Nov 5 22:03:43 UTC 2015
Author: cognet
Date: Thu Nov 5 22:03:42 2015
New Revision: 290422
URL: https://svnweb.freebsd.org/changeset/base/290422
Log:
Make if_macb work with FDT.
Modified:
head/sys/arm/at91/if_macb.c
Modified: head/sys/arm/at91/if_macb.c
==============================================================================
--- head/sys/arm/at91/if_macb.c Thu Nov 5 22:03:27 2015 (r290421)
+++ head/sys/arm/at91/if_macb.c Thu Nov 5 22:03:42 2015 (r290422)
@@ -24,6 +24,8 @@
* SUCH DAMAGE.
*/
+#include "opt_platform.h"
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -72,6 +74,12 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/intr.h>
+#ifdef FDT
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#endif
+
/* "device miibus" required. See GENERIC if you get errors here. */
#include "miibus_if.h"
@@ -1196,6 +1204,11 @@ macbioctl(struct ifnet * ifp, u_long cmd
static int
macb_probe(device_t dev)
{
+#ifdef FDT
+ if (!ofw_bus_is_compatible(dev, "cdns,at32ap7000-macb"))
+ return (ENXIO);
+#endif
+
device_set_desc(dev, "macb");
return (0);
}
@@ -1546,7 +1559,11 @@ static driver_t macb_driver = {
};
+#ifdef FDT
+DRIVER_MODULE(macb, simplebus, macb_driver, macb_devclass, NULL, NULL);
+#else
DRIVER_MODULE(macb, atmelarm, macb_driver, macb_devclass, 0, 0);
+#endif
DRIVER_MODULE(miibus, macb, miibus_driver, miibus_devclass, 0, 0);
MODULE_DEPEND(macb, miibus, 1, 1, 1);
MODULE_DEPEND(macb, ether, 1, 1, 1);
More information about the svn-src-all
mailing list