CVS commit: [netbsd-8] src/sys/arch/arm/sunxi

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Mon Sep 11 05:24:16 UTC 2017

Modified Files:
        src/sys/arch/arm/sunxi [netbsd-8]: sunxi_emac.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #269):
        sys/arch/arm/sunxi/sunxi_emac.c: revision 1.6
Fix a typo that prevented ahb reset from ever being deasserted.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/sys/arch/arm/sunxi/sunxi_emac.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/sunxi/sunxi_emac.c
diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.4.4.2 src/sys/arch/arm/sunxi/sunxi_emac.c:1.4.4.3
--- src/sys/arch/arm/sunxi/sunxi_emac.c:1.4.4.2	Tue Jul 18 19:13:08 2017
+++ src/sys/arch/arm/sunxi/sunxi_emac.c	Mon Sep 11 05:24:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_emac.c,v 1.4.4.2 2017/07/18 19:13:08 snj Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.4.4.3 2017/09/11 05:24:16 snj Exp $ */
 
 /*-
  * Copyright (c) 2016-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -33,7 +33,7 @@
 #include "opt_net_mpsafe.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.4.4.2 2017/07/18 19:13:08 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.4.4.3 2017/09/11 05:24:16 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -1283,7 +1283,7 @@ sunxi_emac_get_resources(struct sunxi_em
 
 	if ((sc->rst_ahb = fdtbus_reset_get(phandle, "ahb")) == NULL)
 		return ENXIO;
-	sc->rst_ahb = fdtbus_reset_get(phandle, "ephy");
+	sc->rst_ephy = fdtbus_reset_get(phandle, "ephy");
 
 	/* Regulator is optional */
 	sc->reg_phy = fdtbus_regulator_acquire(phandle, "phy-supply");