[src/netbsd-7]: src/sys/arch/arm/allwinner Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/7f1aac5e7b7c
branches:  netbsd-7
changeset: 798620:7f1aac5e7b7c
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Nov 25 08:03:06 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #260):
        sys/arch/arm/allwinner/awin_var.h: revision 1.26
        sys/arch/arm/allwinner/awin_gige.c: revision 1.19
        sys/arch/arm/allwinner/awin_gpio.c: revision 1.14
Let pinsets override the default multi-driving select level.
--
Set GMAC pin drv level 3 on A31

diffstat:

 sys/arch/arm/allwinner/awin_gige.c |   4 ++--
 sys/arch/arm/allwinner/awin_gpio.c |  15 ++++++++++++++-
 sys/arch/arm/allwinner/awin_var.h  |   3 ++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diffs (77 lines):

diff -r 74623ac28eaf -r 7f1aac5e7b7c sys/arch/arm/allwinner/awin_gige.c
--- a/sys/arch/arm/allwinner/awin_gige.c        Tue Nov 25 07:58:07 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_gige.c        Tue Nov 25 08:03:06 2014 +0000
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.4.10.1 2014/11/09 14:42:33 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gige.c,v 1.4.10.2 2014/11/25 08:03:06 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -66,7 +66,7 @@
 };
 
 static const struct awin_gpio_pinset awin_gige_gpio_pinset_a31 = {
-       'A', AWIN_A31_PIO_PA_GMAC_FUNC, AWIN_A31_PIO_PA_GMAC_PINS,
+       'A', AWIN_A31_PIO_PA_GMAC_FUNC, AWIN_A31_PIO_PA_GMAC_PINS, 0, 3
 };
 
 
diff -r 74623ac28eaf -r 7f1aac5e7b7c sys/arch/arm/allwinner/awin_gpio.c
--- a/sys/arch/arm/allwinner/awin_gpio.c        Tue Nov 25 07:58:07 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_gpio.c        Tue Nov 25 08:03:06 2014 +0000
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.8.10.3 2014/11/10 08:17:45 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.8.10.4 2014/11/25 08:03:06 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -384,6 +384,16 @@
 }
 
 static void
+awin_gpio_set_pin_drv(struct awin_gpio_pin_cfg *cfg, u_int pin, u_int drv)
+{
+       const u_int shift = (pin & 15) << 1;
+       const u_int i = (pin >> 4) & 1;
+       
+       cfg->drv[i] &= ~(0x03 << shift);
+       cfg->drv[i] |= drv << shift;
+}
+
+static void
 awin_gpio_update_cfg_regs(bus_space_tag_t bst, struct awin_gpio_pin_group *grp,
     const struct awin_gpio_pin_cfg *ncfg)
 {
@@ -577,6 +587,9 @@
                        awin_gpio_set_pin_pull(&ncfg, j, AWIN_PIO_PULL_DOWN);
                else if (req->pinset_flags & GPIO_PIN_PULLUP)
                        awin_gpio_set_pin_pull(&ncfg, j, AWIN_PIO_PULL_UP);
+
+               if (req->pinset_drv)
+                       awin_gpio_set_pin_drv(&ncfg, j, req->pinset_drv);
        }
 
        /*
diff -r 74623ac28eaf -r 7f1aac5e7b7c sys/arch/arm/allwinner/awin_var.h
--- a/sys/arch/arm/allwinner/awin_var.h Tue Nov 25 07:58:07 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_var.h Tue Nov 25 08:03:06 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_var.h,v 1.10.2.5 2014/11/18 18:19:09 snj Exp $ */
+/* $NetBSD: awin_var.h,v 1.10.2.6 2014/11/25 08:03:06 snj Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -76,6 +76,7 @@
        uint8_t pinset_func;
        uint32_t pinset_mask;
        int pinset_flags;
+       int pinset_drv;
 };
 
 struct awin_gpio_pindata {