[src/trunk]: src/sys/arch bpi uses a different mux feature for gmac

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c4d590d07f91
branches:  trunk
changeset: 333523:c4d590d07f91
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Nov 07 11:42:28 2014 +0000

description:
bpi uses a different mux feature for gmac

diffstat:

 sys/arch/arm/allwinner/awin_gige.c  |  9 +++++----
 sys/arch/evbarm/awin/awin_machdep.c |  5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r 8bbdede2768d -r c4d590d07f91 sys/arch/arm/allwinner/awin_gige.c
--- a/sys/arch/arm/allwinner/awin_gige.c        Fri Nov 07 10:36:25 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_gige.c        Fri Nov 07 11:42:28 2014 +0000
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.17 2014/11/06 23:19:38 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.18 2014/11/07 11:42:28 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -102,16 +102,17 @@
        struct awin_gige_softc * const sc = device_private(self);
        struct awinio_attach_args * const aio = aux;
        const struct awin_locators * const loc = &aio->aio_loc;
-       const struct awin_gpio_pinset *pinset =
+       struct awin_gpio_pinset pinset =
            awin_chip_id() == AWIN_CHIP_ID_A31 ?
-           &awin_gige_gpio_pinset_a31 : &awin_gige_gpio_pinset;
+           awin_gige_gpio_pinset_a31 : awin_gige_gpio_pinset;
        prop_dictionary_t cfg = device_properties(self);
        uint32_t clkreg;
        const char *phy_type, *pin_name;
 
        sc->sc_core.sc_dev = self;
 
-       awin_gpio_pinset_acquire(pinset);
+       prop_dictionary_get_uint8(cfg, "pinset-func", &pinset.pinset_func);
+       awin_gpio_pinset_acquire(&pinset);
 
        sc->sc_core.sc_bst = aio->aio_core_bst;
        sc->sc_core.sc_dmat = aio->aio_dmat;
diff -r 8bbdede2768d -r c4d590d07f91 sys/arch/evbarm/awin/awin_machdep.c
--- a/sys/arch/evbarm/awin/awin_machdep.c       Fri Nov 07 10:36:25 2014 +0000
+++ b/sys/arch/evbarm/awin/awin_machdep.c       Fri Nov 07 11:42:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awin_machdep.c,v 1.24 2014/11/06 23:19:38 jmcneill Exp $ */
+/*     $NetBSD: awin_machdep.c,v 1.25 2014/11/07 11:42:28 jmcneill Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.24 2014/11/06 23:19:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.25 2014/11/07 11:42:28 jmcneill Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -743,6 +743,7 @@
 #if AWIN_BOARD == AWIN_bpi
                prop_dictionary_set_cstring(dict, "phy-power", "gmacpwren");
                prop_dictionary_set_cstring(dict, "phy-type", "rgmii-bpi");
+               prop_dictionary_set_uint8(dict, "pinset-func", 2);
 #endif
                return;
        }