Module Name: src
Committed By: jmcneill
Date: Sun Nov 23 23:04:58 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_gpio.c awin_var.h
Log Message:
Let pinsets override the default multi-driving select level.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/allwinner/awin_var.h
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/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.13 src/sys/arch/arm/allwinner/awin_gpio.c:1.14
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.13 Sun Nov 2 23:54:16 2014
+++ src/sys/arch/arm/allwinner/awin_gpio.c Sun Nov 23 23:04:58 2014
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.13 2014/11/02 23:54:16 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.14 2014/11/23 23:04:58 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -384,6 +384,16 @@ awin_gpio_set_pin_pull(struct awin_gpio_
}
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_pinset_acquire(const struct aw
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);
}
/*
Index: src/sys/arch/arm/allwinner/awin_var.h
diff -u src/sys/arch/arm/allwinner/awin_var.h:1.25 src/sys/arch/arm/allwinner/awin_var.h:1.26
--- src/sys/arch/arm/allwinner/awin_var.h:1.25 Mon Nov 17 01:38:00 2014
+++ src/sys/arch/arm/allwinner/awin_var.h Sun Nov 23 23:04:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_var.h,v 1.25 2014/11/17 01:38:00 jmcneill Exp $ */
+/* $NetBSD: awin_var.h,v 1.26 2014/11/23 23:04:58 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -76,6 +76,7 @@ struct awin_gpio_pinset {
uint8_t pinset_func;
uint32_t pinset_mask;
int pinset_flags;
+ int pinset_drv;
};
struct awin_gpio_pindata {
