Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/arch/arm/sunxi Pull up following revision(s) (request...



details:   https://anonhg.NetBSD.org/src/rev/4542f6f635ce
branches:  netbsd-8
changeset: 434296:4542f6f635ce
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Sep 11 05:24:16 2017 +0000

description:
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.

diffstat:

 sys/arch/arm/sunxi/sunxi_emac.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 17081c7cd2db -r 4542f6f635ce sys/arch/arm/sunxi/sunxi_emac.c
--- a/sys/arch/arm/sunxi/sunxi_emac.c   Mon Sep 11 05:22:18 2017 +0000
+++ b/sys/arch/arm/sunxi/sunxi_emac.c   Mon Sep 11 05:24:16 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 
        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");



Home | Main Index | Thread Index | Old Index