 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_emac.c,v 1.10 2017/11/30 21:36:11 jmcneill Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.11 2017/12/01 17:47:51 jmcneill Exp $ */
 /*-
  * Copyright (c) 2016-2017 Jared McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -23,27 +23,27 @@
  * 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.
  */
 /*
  * Allwinner Gigabit Ethernet MAC (EMAC) controller
  */
 #include "opt_net_mpsafe.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.10 2017/11/30 21:36:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.11 2017/12/01 17:47:51 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/callout.h>
 #include <sys/gpio.h>
 #include <sys/cprng.h>
 #include <net/if.h>
 @@ -1300,52 +1300,67 @@ sunxi_emac_get_resources(struct sunxi_em
 		if (fdtbus_get_reg(syscon_phandle, 0, &addr, &size) != 0)
 			return ENXIO;
 		if (size < EMAC_CLK_REG + 4)
 			return ENXIO;
 		addr += EMAC_CLK_REG;
 		size -= EMAC_CLK_REG;
 	} else {
 		if (fdtbus_get_reg(phandle, 1, &addr, &size) != 0)
 			return ENXIO;
+	}
 	if (bus_space_map(sc->bst, addr, size, 0, &sc->bsh[_RES_SYSCON]) != 0)
 		return ENXIO;
-	/* Get clocks and resets. "ahb" is required, "ephy" is optional. */
+	/* The "ahb"/"stmmaceth" clock and reset is required */
 	if ((sc->clk_ahb = fdtbus_clock_get(phandle, "ahb")) == NULL &&
-	if ((sc->clk_ahb = fdtbus_clock_get(phandle, "ahb")) == NULL)
+	    (sc->clk_ahb = fdtbus_clock_get(phandle, "stmmaceth")) == NULL)
 		return ENXIO;
-	sc->clk_ephy = fdtbus_clock_get(phandle, "ephy");
+	if ((sc->rst_ahb = fdtbus_reset_get(phandle, "ahb")) == NULL &&
 	    (sc->rst_ahb = fdtbus_reset_get(phandle, "stmmaceth")) == NULL)
 	if ((sc->rst_ahb = fdtbus_reset_get(phandle, "ahb")) == NULL)
 		return ENXIO;
 	/* Internal PHY clock and reset are optional properties. */
 	sc->clk_ephy = fdtbus_clock_get(phandle, "ephy");
 	if (sc->clk_ephy == NULL) {
 		int phy_phandle = fdtbus_get_phandle(phandle, "phy-handle");
 		if (phy_phandle != -1)
 			sc->clk_ephy = fdtbus_clock_get_index(phy_phandle, 0);
+	}
 	sc->rst_ephy = fdtbus_reset_get(phandle, "ephy");
 	if (sc->rst_ephy == NULL) {
 		int phy_phandle = fdtbus_get_phandle(phandle, "phy-phandle");
 		if (phy_phandle != -1)
 			sc->rst_ephy = fdtbus_reset_get_index(phy_phandle, 0);
+	}
 	/* Regulator is optional */
 	sc->reg_phy = fdtbus_regulator_acquire(phandle, "phy-supply");
 	/* Reset GPIO is optional */
 	sc->pin_reset = fdtbus_gpio_acquire(sc->phandle,
 	    "allwinner,reset-gpio", GPIO_PIN_OUTPUT);
 	return 0;
+}
 static int
 sunxi_emac_get_phyid(struct sunxi_emac_softc *sc)
+{
 	bus_addr_t addr;
 	int phy_phandle;
-	const int phy_phandle = fdtbus_get_phandle(sc->phandle, "phy");
+	phy_phandle = fdtbus_get_phandle(sc->phandle, "phy");
 	if (phy_phandle == -1)
 		phy_phandle = fdtbus_get_phandle(sc->phandle, "phy-handle");
 	if (phy_phandle == -1)
 		return MII_PHY_ANY;
 	if (fdtbus_get_reg(phy_phandle, 0, &addr, NULL) != 0)
 		return MII_PHY_ANY;
 	return (int)addr;
+}
 static int
 sunxi_emac_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;