svn commit: r271377 - in head/sys: arm/versatile conf dev/smc

[Andrew Turner]

Author: andrew
Date: Wed Sep 10 10:59:17 2014
New Revision: 271377
URL: http://svnweb.freebsd.org/changeset/base/271377

Log:
  Move if_smc_fdt.c to live in sys/dev/smc. It's not specific to the ARM
  Versatile hardware.

Added:
  head/sys/dev/smc/if_smc_fdt.c
     - copied unchanged from r271375, head/sys/arm/versatile/if_smc_fdt.c
Deleted:
  head/sys/arm/versatile/if_smc_fdt.c
Modified:
  head/sys/arm/versatile/files.versatile
  head/sys/conf/files

Modified: head/sys/arm/versatile/files.versatile
==============================================================================
--- head/sys/arm/versatile/files.versatile	Wed Sep 10 10:40:16 2014	(r271376)
+++ head/sys/arm/versatile/files.versatile	Wed Sep 10 10:59:17 2014	(r271377)
@@ -17,6 +17,5 @@ arm/versatile/versatile_pci.c			optional
 arm/versatile/versatile_pci_bus_space.c		optional pci
 arm/versatile/versatile_sic.c			standard
 arm/versatile/versatile_timer.c			standard
-arm/versatile/if_smc_fdt.c			optional smc
 
 kern/kern_clocksource.c                         standard

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Wed Sep 10 10:40:16 2014	(r271376)
+++ head/sys/conf/files	Wed Sep 10 10:59:17 2014	(r271377)
@@ -2188,6 +2188,7 @@ dev/smbus/smbconf.c		optional smbus
 dev/smbus/smbus.c		optional smbus
 dev/smbus/smbus_if.m		optional smbus
 dev/smc/if_smc.c		optional smc
+dev/smc/if_smc_fdt.c		optional smc fdt
 dev/sn/if_sn.c			optional sn
 dev/sn/if_sn_isa.c		optional sn isa
 dev/sn/if_sn_pccard.c		optional sn pccard

Copied: head/sys/dev/smc/if_smc_fdt.c (from r271375, head/sys/arm/versatile/if_smc_fdt.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/smc/if_smc_fdt.c	Wed Sep 10 10:59:17 2014	(r271377, copy of r271375, head/sys/arm/versatile/if_smc_fdt.c)
@@ -0,0 +1,135 @@
+/*-
+ * Copyright (c) 2008 Benno Rice
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/taskqueue.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_media.h>
+
+#include <dev/smc/if_smcvar.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include "miibus_if.h"
+
+static int		smc_fdt_probe(device_t);
+static int		smc_fdt_attach(device_t);
+static int		smc_fdt_detach(device_t);
+
+static int
+smc_fdt_probe(device_t dev)
+{
+	struct	smc_softc *sc;
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (ofw_bus_is_compatible(dev, "smsc,lan91c111")) {
+		sc = device_get_softc(dev);
+		sc->smc_usemem = 1;
+
+		if (smc_probe(dev) != 0) {
+			return (ENXIO);
+		}
+
+		return (0);
+	}
+
+	return (ENXIO);
+}
+
+static int
+smc_fdt_attach(device_t dev)
+{
+	int	err;
+ 	struct	smc_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	err = smc_attach(dev);
+	if (err) {
+		return (err);
+	}
+
+	return (0);
+}
+
+static int
+smc_fdt_detach(device_t dev)
+{
+
+	smc_detach(dev);
+
+	return (0);
+}
+
+static device_method_t smc_fdt_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		smc_fdt_probe),
+	DEVMETHOD(device_attach,	smc_fdt_attach),
+	DEVMETHOD(device_detach,	smc_fdt_detach),
+
+	/* MII interface */
+	DEVMETHOD(miibus_readreg,	smc_miibus_readreg),
+	DEVMETHOD(miibus_writereg,	smc_miibus_writereg),
+	DEVMETHOD(miibus_statchg,	smc_miibus_statchg),
+
+	{ 0, 0 }
+};
+
+static driver_t smc_fdt_driver = {
+	"smc",
+	smc_fdt_methods,
+	sizeof(struct smc_softc),
+};
+
+extern devclass_t smc_devclass;
+
+DRIVER_MODULE(smc, simplebus, smc_fdt_driver, smc_devclass, 0, 0);
+DRIVER_MODULE(miibus, smc, miibus_driver, miibus_devclass, 0, 0);
+MODULE_DEPEND(smc, fdt, 1, 1, 1);
+MODULE_DEPEND(smc, ether, 1, 1, 1);
+MODULE_DEPEND(smc, miibus, 1, 1, 1);