CVS commit: src/sys/arch/powerpc/booke/dev

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Thu Apr 19 21:32:01 UTC 2012

Modified Files:
        src/sys/arch/powerpc/booke/dev: pq3etsec.c

Log Message:
Read maccfg1/maccfg2/ecntrl so we can preserve bits we don't change (like
GMII mode).


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/booke/dev/pq3etsec.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/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.10 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.11
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.10	Tue Feb 21 02:08:55 2012
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c	Thu Apr 19 21:32:01 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3etsec.c,v 1.10 2012/02/21 02:08:55 matt Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.11 2012/04/19 21:32:01 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.10 2012/02/21 02:08:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.11 2012/04/19 21:32:01 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -592,6 +592,9 @@ pq3etsec_attach(device_t parent, device_
 
 	etsec_write(sc, ATTR, ATTR_DEFAULT);
 	etsec_write(sc, ATTRELI, ATTRELI_DEFAULT);
+	sc->sc_maccfg1 = etsec_read(sc, MACCFG1);
+	sc->sc_maccfg2 = etsec_read(sc, MACCFG2);
+	sc->sc_ecntrl = etsec_read(sc, ECNTRL);
 
 	sc->sc_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_SOFTNET);