Module Name: src
Committed By: snj
Date: Tue Nov 25 08:03:06 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_gige.c awin_gpio.c
awin_var.h
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/sys/arch/arm/allwinner/awin_gige.c
cvs rdiff -u -r1.8.10.3 -r1.8.10.4 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.10.2.5 -r1.10.2.6 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_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.1 src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.2
--- src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.1 Sun Nov 9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c Tue Nov 25 08:03:06 2014
@@ -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 awi
};
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
};
Index: src/sys/arch/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.3 src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.4
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.3 Mon Nov 10 08:17:45 2014
+++ src/sys/arch/arm/allwinner/awin_gpio.c Tue Nov 25 08:03:06 2014
@@ -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 @@ 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.10.2.5 src/sys/arch/arm/allwinner/awin_var.h:1.10.2.6
--- src/sys/arch/arm/allwinner/awin_var.h:1.10.2.5 Tue Nov 18 18:19:09 2014
+++ src/sys/arch/arm/allwinner/awin_var.h Tue Nov 25 08:03:06 2014
@@ -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 @@ struct awin_gpio_pinset {
uint8_t pinset_func;
uint32_t pinset_mask;
int pinset_flags;
+ int pinset_drv;
};
struct awin_gpio_pindata {
