[src/trunk]: src/sys/arch/arm/allwinner add an option for awin_gpio to ignore...

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

details:   https://anonhg.NetBSD.org/src/rev/307334d4db7e
branches:  trunk
changeset: 332854:307334d4db7e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Oct 10 17:48:30 2014 +0000

description:
add an option for awin_gpio to ignore firmware pin reservations

diffstat:

 sys/arch/arm/allwinner/awin_gpio.c |  6 +++++-
 sys/arch/arm/allwinner/files.awin  |  3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r 6ca3a850ea1d -r 307334d4db7e sys/arch/arm/allwinner/awin_gpio.c
--- a/sys/arch/arm/allwinner/awin_gpio.c        Fri Oct 10 17:44:17 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_gpio.c        Fri Oct 10 17:48:30 2014 +0000
@@ -31,10 +31,11 @@
 #include "gpio.h"
 
 #include "opt_arm_debug.h"
+#include "opt_allwinner.h"
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.9 2014/08/24 12:42:03 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.10 2014/10/10 17:48:30 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -382,6 +383,7 @@
                grp->grp_cfg.pul[1] = bus_space_read_4(sc->sc_bst,
                    grp->grp_bsh, AWIN_PIO_PUL1_REG);
 
+#if !defined(AWIN_GPIO_IGNORE_FW)
                for (uint32_t j = 0, mask = 1;
                     (mask & grp->grp_pin_mask) != 0;
                     j++, mask <<= 1) {
@@ -390,6 +392,8 @@
                                grp->grp_pin_inuse_mask |= mask;
                        }
                }
+#endif
+
 #ifdef VERBOSE_INIT_ARM
                printf(" P%c=%d", 'A' + i,
                    popcount32(grp->grp_pin_mask & ~grp->grp_pin_inuse_mask));
diff -r 6ca3a850ea1d -r 307334d4db7e sys/arch/arm/allwinner/files.awin
--- a/sys/arch/arm/allwinner/files.awin Fri Oct 10 17:44:17 2014 +0000
+++ b/sys/arch/arm/allwinner/files.awin Fri Oct 10 17:48:30 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.awin,v 1.14 2014/09/13 17:48:52 jmcneill Exp $
+#      $NetBSD: files.awin,v 1.15 2014/10/10 17:48:30 jmcneill Exp $
 #
 # Configuration info for Allwinner ARM Peripherals
 #
@@ -26,6 +26,7 @@
 defflag opt_allwinner.h                                ALLWINNER_A10
 defflag opt_allwinner.h                                ALLWINNER_A20
 defflag opt_allwinner.h                                ALLWINNER_A31
+defflag opt_allwinner.h                                AWIN_GPIO_IGNORE_FW
 
 # SoC I/O attach point
 device awinio { [port=-1] } : bus_space_generic