D5177.id12971.diff
No OneTemporary
Actions

Size

50 KB

Referenced Files

None

Subscribers

None

D5177.id12971.diff
View Options

	Index: sys/arm/allwinner/a10_ahci.c
	===================================================================
	--- sys/arm/allwinner/a10_ahci.c
	+++ sys/arm/allwinner/a10_ahci.c
	@@ -41,7 +41,6 @@
	#include <sys/rman.h>
	#include <sys/kernel.h>
	#include <sys/module.h>
	-#include <sys/gpio.h>

	#include <machine/bus.h>
	#include <dev/ofw/ofw_bus.h>
	@@ -49,7 +48,6 @@

	#include <dev/ahci/ahci.h>
	#include <arm/allwinner/a10_clk.h>
	-#include "gpio_if.h"

	/*
	* Allwinner a1x/a2x/a8x SATA attachment. This is just the AHCI register
	@@ -119,9 +117,6 @@
	#define AHCI_P0PHYCR 0x0078
	#define AHCI_P0PHYSR 0x007C

	-/* Kludge for CUBIEBOARD (and Banana PI too) */
	-#define GPIO_AHCI_PWR 40
	-
	static void inline
	ahci_set(struct resource *m, bus_size_t off, uint32_t set)
	{
	@@ -298,7 +293,6 @@
	static int
	ahci_a10_attach(device_t dev)
	{
	- device_t gpio;
	int error;
	struct ahci_controller *ctlr;

	@@ -316,19 +310,6 @@
	/* Turn on the PLL for SATA */
	a10_clk_ahci_activate();

	- /* Apply power to the drive, if any */
	- gpio = devclass_get_device(devclass_find("gpio"), 0);
	- if (gpio == NULL) {
	- device_printf(dev,
	- "GPIO device not yet present (SATA won't work).\n");
	- bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid,
	- ctlr->r_mem);
	- return (ENXIO);
	- }
	- GPIO_PIN_SETFLAGS(gpio, GPIO_AHCI_PWR, GPIO_PIN_OUTPUT);
	- GPIO_PIN_SET(gpio, GPIO_AHCI_PWR, GPIO_PIN_HIGH);
	- DELAY(10000);
	-
	/* Reset controller */
	if ((error = ahci_a10_ctlr_reset(dev)) != 0) {
	bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid,
	Index: sys/arm/allwinner/a10_gpio.c
	===================================================================
	--- sys/arm/allwinner/a10_gpio.c
	+++ sys/arm/allwinner/a10_gpio.c
	@@ -47,12 +47,15 @@
	#include <machine/intr.h>

	#include <dev/fdt/fdt_common.h>
	+#include <dev/fdt/fdt_pinctrl.h>
	#include <dev/gpio/gpiobusvar.h>
	#include <dev/ofw/ofw_bus.h>
	#include <dev/ofw/ofw_bus_subr.h>

	+#include <arm/allwinner/allwinner_machdep.h>
	+#include <arm/allwinner/allwinner_pinctrl.h>
	+
	#include "gpio_if.h"
	-#include "a10_gpio.h"

	/*
	* A10 have 9 banks of gpio.
	@@ -62,7 +65,6 @@
	* PG0 - PG9 \| PH0 - PH27 \| PI0 - PI12
	*/

	-#define A10_GPIO_PINS 288
	#define A10_GPIO_DEFAULT_CAPS (GPIO_PIN_INPUT \| GPIO_PIN_OUTPUT \| \
	GPIO_PIN_PULLUP \| GPIO_PIN_PULLDOWN)

	@@ -82,8 +84,14 @@
	bus_space_tag_t sc_bst;
	bus_space_handle_t sc_bsh;
	void * sc_intrhand;
	+ const struct allwinner_padconf * padconf;
	};

	+/* Defined in a10_pinctrl.c */
	+extern const struct allwinner_padconf a10_padconf;
	+/* Defined in a20_pinctrl.c */
	+extern const struct allwinner_padconf a20_padconf;
	+
	#define A10_GPIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx)
	#define A10_GPIO_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx)
	#define A10_GPIO_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
	@@ -117,8 +125,10 @@
	/* Must be called with lock held. */
	A10_GPIO_LOCK_ASSERT(sc);

	- bank = pin / 32;
	- pin = pin % 32;
	+ if (pin > sc->padconf->npins)
	+ return (0);
	+ bank = sc->padconf->pins[pin].port;
	+ pin = sc->padconf->pins[pin].pin;
	offset = ((pin & 0x07) << 2);

	func = A10_GPIO_READ(sc, A10_GPIO_GP_CFG(bank, pin >> 3));
	@@ -140,8 +150,8 @@
	/* Must be called with lock held. */
	A10_GPIO_LOCK_ASSERT(sc);

	- bank = pin / 32;
	- pin = pin % 32;
	+ bank = sc->padconf->pins[pin].port;
	+ pin = sc->padconf->pins[pin].pin;
	offset = ((pin & 0x07) << 2);

	data = A10_GPIO_READ(sc, A10_GPIO_GP_CFG(bank, pin >> 3));
	@@ -158,8 +168,8 @@
	/* Must be called with lock held. */
	A10_GPIO_LOCK_ASSERT(sc);

	- bank = pin / 32;
	- pin = pin % 32;
	+ bank = sc->padconf->pins[pin].port;
	+ pin = sc->padconf->pins[pin].pin;
	offset = ((pin & 0x0f) << 1);

	val = A10_GPIO_READ(sc, A10_GPIO_GP_PUL(bank, pin >> 4));
	@@ -181,8 +191,8 @@
	/* Must be called with lock held. */
	A10_GPIO_LOCK_ASSERT(sc);

	- bank = pin / 32;
	- pin = pin % 32;
	+ bank = sc->padconf->pins[pin].port;
	+ pin = sc->padconf->pins[pin].pin;
	offset = ((pin & 0x0f) << 1);

	val = A10_GPIO_READ(sc, A10_GPIO_GP_PUL(bank, pin >> 4));
	@@ -192,6 +202,24 @@
	}

	static void
	+a10_gpio_set_drv(struct a10_gpio_softc *sc, uint32_t pin, uint32_t drive)
	+{
	+ uint32_t bank, offset, val;
	+
	+ /* Must be called with lock held. */
	+ A10_GPIO_LOCK_ASSERT(sc);
	+
	+ bank = sc->padconf->pins[pin].port;
	+ pin = sc->padconf->pins[pin].pin;
	+ offset = ((pin & 0x0f) << 1);
	+
	+ val = A10_GPIO_READ(sc, A10_GPIO_GP_DRV(bank, pin >> 4));
	+ val &= ~(0x03 << offset);
	+ val \|= (drive << offset);
	+ A10_GPIO_WRITE(sc, A10_GPIO_GP_DRV(bank, pin >> 4), val);
	+}
	+
	+static void
	a10_gpio_pin_configure(struct a10_gpio_softc *sc, uint32_t pin, uint32_t flags)
	{

	@@ -229,8 +257,11 @@
	static int
	a10_gpio_pin_max(device_t dev, int *maxpin)
	{
	+ struct a10_gpio_softc *sc;

	- *maxpin = A10_GPIO_PINS - 1;
	+ sc = device_get_softc(dev);
	+
	+ *maxpin = sc->padconf->npins;
	return (0);
	}

	@@ -238,7 +269,8 @@
	a10_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps)
	{

	- if (pin >= A10_GPIO_PINS)
	+ sc = device_get_softc(dev);
	+ if (pin >= sc->padconf->npins)
	return (EINVAL);

	*caps = A10_GPIO_DEFAULT_CAPS;
	@@ -251,10 +283,10 @@
	{
	struct a10_gpio_softc *sc;

	- if (pin >= A10_GPIO_PINS)
	+ sc = device_get_softc(dev);
	+ if (pin >= sc->padconf->npins)
	return (EINVAL);

	- sc = device_get_softc(dev);
	A10_GPIO_LOCK(sc);
	*flags = a10_gpio_get_function(sc, pin);
	*flags \|= a10_gpio_get_pud(sc, pin);
	@@ -266,14 +298,14 @@
	static int
	a10_gpio_pin_getname(device_t dev, uint32_t pin, char *name)
	{
	- uint32_t bank;
	+ struct a10_gpio_softc *sc;

	- if (pin >= A10_GPIO_PINS)
	+ sc = device_get_softc(dev);
	+ if (pin >= sc->padconf->npins)
	return (EINVAL);

	- bank = pin / 32;
	- snprintf(name, GPIOMAXNAME - 1, "pin %d (P%c%d)",
	- pin, bank + 'A', pin % 32);
	+ snprintf(name, GPIOMAXNAME - 1, "pin %d (%s)",
	+ pin, sc->padconf->pins[pin].name);
	name[GPIOMAXNAME - 1] = '\0';

	return (0);
	@@ -284,10 +316,10 @@
	{
	struct a10_gpio_softc *sc;

	- if (pin >= A10_GPIO_PINS)
	+ sc = device_get_softc(dev);
	+ if (pin > sc->padconf->npins)
	return (EINVAL);

	- sc = device_get_softc(dev);
	A10_GPIO_LOCK(sc);
	a10_gpio_pin_configure(sc, pin, flags);
	A10_GPIO_UNLOCK(sc);
	@@ -301,13 +333,13 @@
	struct a10_gpio_softc *sc;
	uint32_t bank, data;

	- if (pin >= A10_GPIO_PINS)
	+ sc = device_get_softc(dev);
	+ if (pin > sc->padconf->npins)
	return (EINVAL);

	- bank = pin / 32;
	- pin = pin % 32;
	+ bank = sc->padconf->pins[pin].port;
	+ pin = sc->padconf->pins[pin].pin;

	- sc = device_get_softc(dev);
	A10_GPIO_LOCK(sc);
	data = A10_GPIO_READ(sc, A10_GPIO_GP_DAT(bank));
	if (value)
	@@ -326,13 +358,13 @@
	struct a10_gpio_softc *sc;
	uint32_t bank, reg_data;

	- if (pin >= A10_GPIO_PINS)
	+ sc = device_get_softc(dev);
	+ if (pin > sc->padconf->npins)
	return (EINVAL);

	- bank = pin / 32;
	- pin = pin % 32;
	+ bank = sc->padconf->pins[pin].port;
	+ pin = sc->padconf->pins[pin].pin;

	- sc = device_get_softc(dev);
	A10_GPIO_LOCK(sc);
	reg_data = A10_GPIO_READ(sc, A10_GPIO_GP_DAT(bank));
	A10_GPIO_UNLOCK(sc);
	@@ -347,13 +379,13 @@
	struct a10_gpio_softc *sc;
	uint32_t bank, data;

	- if (pin >= A10_GPIO_PINS)
	+ sc = device_get_softc(dev);
	+ if (pin > sc->padconf->npins)
	return (EINVAL);

	- bank = pin / 32;
	- pin = pin % 32;
	+ bank = sc->padconf->pins[pin].port;
	+ pin = sc->padconf->pins[pin].pin;

	- sc = device_get_softc(dev);
	A10_GPIO_LOCK(sc);
	data = A10_GPIO_READ(sc, A10_GPIO_GP_DAT(bank));
	if (data & (1 << pin))
	@@ -367,6 +399,52 @@
	}

	static int
	+aw_fdt_configure_pins(device_t dev, phandle_t cfgxref)
	+{
	+ struct a10_gpio_softc *sc;
	+ phandle_t node;
	+ const char **pinlist = NULL;
	+ char *pin_function = NULL;
	+ uint32_t pin_drive, pin_pull;
	+ int pinnum, i, j, k;
	+
	+ sc = device_get_softc(dev);
	+ node = OF_node_from_xref(cfgxref);
	+
	+ /* Getting all prop for configuring pins */
	+ pinnum = ofw_bus_string_list_to_array(node, "allwinner,pins", &pinlist);
	+ if (OF_getprop_alloc(node, "allwinner,function", sizeof(pin_function), (void *)&pin_function) == -1)
	+ return (ENOENT);
	+ if (OF_getencprop(node, "allwinner,drive", &pin_drive, sizeof(pin_drive)) == -1)
	+ return (ENOENT);
	+ if (OF_getencprop(node, "allwinner,pull", &pin_pull, sizeof(pin_pull)) == -1)
	+ return (ENOENT);
	+
	+ /* Configure each pin to the correct function, drive and pull */
	+ for (i = 0; i < pinnum; i++) {
	+ for (j = 0; j < sc->padconf->npins; j++) {
	+ if (!strcmp(pinlist[i], sc->padconf->pins[j].name)) {
	+ /* Searching the list of function for that pin */
	+ for (k = 0; k < 8; k++) {
	+ if (sc->padconf->pins[j].functions[k] &&
	+ !strcmp(pin_function, sc->padconf->pins[j].functions[k])) {
	+ A10_GPIO_LOCK(sc);
	+ a10_gpio_set_function(sc, j, k);
	+ a10_gpio_set_drv(sc, j, pin_drive);
	+ a10_gpio_set_pud(sc, j, pin_pull);
	+ A10_GPIO_UNLOCK(sc);
	+ }
	+ }
	+ }
	+ }
	+ }
	+
	+ free(pinlist, M_OFWPROP);
	+ free(pin_function, M_OFWPROP);
	+ return (0);
	+}
	+
	+static int
	a10_gpio_probe(device_t dev)
	{

	@@ -422,6 +500,25 @@
	if (sc->sc_busdev == NULL)
	goto fail;

	+
	+ /* Use the right pin data for the current SoC */
	+ switch (allwinner_soc_type()) {
	+ case ALLWINNERSOC_A10:
	+ sc->padconf = &a10_padconf;
	+ break;
	+ case ALLWINNERSOC_A20:
	+ sc->padconf = &a20_padconf;
	+ break;
	+ default:
	+ return (ENOENT);
	+ }
	+
	+ /*
	+ * Register as a pinctrl device
	+ */
	+ fdt_pinctrl_register(dev, "allwinner,pins");
	+ fdt_pinctrl_configure_tree(dev);
	+
	return (0);

	fail:
	@@ -453,9 +550,18 @@
	a10_gpio_map_gpios(device_t bus, phandle_t dev, phandle_t gparent, int gcells,
	pcell_t gpios, uint32_t pin, uint32_t *flags)
	{
	+ struct a10_gpio_softc *sc;
	+ int i;
	+
	+ sc = device_get_softc(bus);

	/* The GPIO pins are mapped as: <gpio-phandle bank pin flags>. */
	- pin = gpios[0] 32 + gpios[1];
	+ for (i = 0; i < sc->padconf->npins; i++)
	+ if (sc->padconf->pins[i].port == gpios[0] &&
	+ sc->padconf->pins[i].pin == gpios[1]) {
	+ *pin = i;
	+ break;
	+ }
	*flags = gpios[gcells - 1];

	return (0);
	@@ -482,6 +588,9 @@
	/* ofw_bus interface */
	DEVMETHOD(ofw_bus_get_node, a10_gpio_get_node),

	+ /* fdt_pinctrl interface */
	+ DEVMETHOD(fdt_pinctrl_configure,aw_fdt_configure_pins),
	+
	DEVMETHOD_END
	};

	@@ -494,21 +603,3 @@
	};

	DRIVER_MODULE(a10_gpio, simplebus, a10_gpio_driver, a10_gpio_devclass, 0, 0);
	-
	-int
	-a10_gpio_ethernet_activate(uint32_t func)
	-{
	- int i;
	- struct a10_gpio_softc *sc = a10_gpio_sc;
	-
	- if (sc == NULL)
	- return (ENXIO);
	-
	- /* Configure pin mux settings for MII. */
	- A10_GPIO_LOCK(sc);
	- for (i = 0; i <= 17; i++)
	- a10_gpio_set_function(sc, i, func);
	- A10_GPIO_UNLOCK(sc);
	-
	- return (0);
	-}
	Index: sys/arm/allwinner/a10_padconf.c
	===================================================================
	--- /dev/null
	+++ sys/arm/allwinner/a10_padconf.c
	@@ -0,0 +1,224 @@
	+/*-
	+ * Copyright (c) 2016 Emmanuel Vadot <manu@bidouilliste.com>
	+ * All rights reserved.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ */
	+
	+#include <sys/param.h>
	+#include <sys/systm.h>
	+#include <sys/kernel.h>
	+#include <sys/types.h>
	+
	+#include <arm/allwinner/allwinner_pinctrl.h>
	+
	+const static struct allwinner_pins a10_pins[] = {
	+ {"PA0", 0, 0, {"gpio_in", "gpio_out", "emac", "spi1", "uart2", NULL, NULL, NULL}},
	+ {"PA1", 0, 1, {"gpio_in", "gpio_out", "emac", "spi1", "uart2", NULL, NULL, NULL}},
	+ {"PA2", 0, 2, {"gpio_in", "gpio_out", "emac", "spi1", "uart2", NULL, NULL, NULL}},
	+ {"PA3", 0, 3, {"gpio_in", "gpio_out", "emac", "spi1", "uart2", NULL, NULL, NULL}},
	+ {"PA4", 0, 4, {"gpio_in", "gpio_out", "emac", "spi1", NULL, NULL, NULL, NULL}},
	+ {"PA5", 0, 5, {"gpio_in", "gpio_out", "emac", "spi3", NULL, NULL, NULL, NULL}},
	+ {"PA6", 0, 6, {"gpio_in", "gpio_out", "emac", "spi3", NULL, NULL, NULL, NULL}},
	+ {"PA7", 0, 7, {"gpio_in", "gpio_out", "emac", "spi3", NULL, NULL, NULL, NULL}},
	+ {"PA8", 0, 8, {"gpio_in", "gpio_out", "emac", "spi3", NULL, NULL, NULL, NULL}},
	+ {"PA9", 0, 9, {"gpio_in", "gpio_out", "emac", "spi3", NULL, NULL, NULL, NULL}},
	+ {"PA10", 0, 10, {"gpio_in", "gpio_out", "emac", NULL, "uart1", NULL, NULL, NULL}},
	+ {"PA11", 0, 11, {"gpio_in", "gpio_out", "emac", NULL, "uart1", NULL, NULL, NULL}},
	+ {"PA12", 0, 12, {"gpio_in", "gpio_out", "emac", "uart6", "uart1", NULL, NULL, NULL}},
	+ {"PA13", 0, 13, {"gpio_in", "gpio_out", "emac", "uart6", "uart1", NULL, NULL, NULL}},
	+ {"PA14", 0, 14, {"gpio_in", "gpio_out", "emac", "uart7", "uart1", NULL, NULL, NULL}},
	+ {"PA15", 0, 15, {"gpio_in", "gpio_out", "emac", "uart7", "uart1", NULL, NULL, NULL}},
	+ {"PA16", 0, 16, {"gpio_in", "gpio_out", NULL, "can", "uart1", NULL, NULL, NULL}},
	+ {"PA17", 0, 17, {"gpio_in", "gpio_out", NULL, "can", "uart1", NULL, NULL, NULL}},
	+
	+ {"PB0", 1, 0, {"gpio_in", "gpio_out", "i2c0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB1", 1, 1, {"gpio_in", "gpio_out", "i2c0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB2", 1, 2, {"gpio_in", "gpio_out", "pwm", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB3", 1, 3, {"gpio_in", "gpio_out", "ir0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB4", 1, 4, {"gpio_in", "gpio_out", "ir0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB5", 1, 5, {"gpio_in", "gpio_out", "i2s", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB6", 1, 6, {"gpio_in", "gpio_out", "i2s", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB7", 1, 7, {"gpio_in", "gpio_out", "i2s", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB8", 1, 8, {"gpio_in", "gpio_out", "i2s", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB9", 1, 9, {"gpio_in", "gpio_out", "i2s", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB10", 1, 10, {"gpio_in", "gpio_out", "i2s", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB11", 1, 11, {"gpio_in", "gpio_out", "i2s", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB12", 1, 12, {"gpio_in", "gpio_out", "i2s", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB13", 1, 13, {"gpio_in", "gpio_out", "spi2", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB14", 1, 14, {"gpio_in", "gpio_out", "spi2", "jtag", NULL, NULL, NULL, NULL}},
	+ {"PB15", 1, 15, {"gpio_in", "gpio_out", "spi2", "jtag", NULL, NULL, NULL, NULL}},
	+ {"PB16", 1, 16, {"gpio_in", "gpio_out", "spi2", "jtag", NULL, NULL, NULL, NULL}},
	+ {"PB17", 1, 17, {"gpio_in", "gpio_out", "spi2", "jtag", NULL, NULL, NULL, NULL}},
	+ {"PB18", 1, 18, {"gpio_in", "gpio_out", "i2c1", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB19", 1, 19, {"gpio_in", "gpio_out", "i2c1", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB20", 1, 20, {"gpio_in", "gpio_out", "i2c1", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB21", 1, 21, {"gpio_in", "gpio_out", "i2c1", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB22", 1, 22, {"gpio_in", "gpio_out", "uart0", "ir1", NULL, NULL, NULL, NULL}},
	+ {"PB23", 1, 23, {"gpio_in", "gpio_out", "uart0", "ir1", NULL, NULL, NULL, NULL}},
	+
	+ {"PC0", 2, 0, {"gpio_in", "gpio_out", "nand", "spi0", NULL, NULL, NULL, NULL}},
	+ {"PC1", 2, 1, {"gpio_in", "gpio_out", "nand", "spi0", NULL, NULL, NULL, NULL}},
	+ {"PC2", 2, 2, {"gpio_in", "gpio_out", "nand", "spi0", NULL, NULL, NULL, NULL}},
	+ {"PC3", 2, 3, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC4", 2, 4, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC5", 2, 5, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC6", 2, 6, {"gpio_in", "gpio_out", "nand", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC7", 2, 7, {"gpio_in", "gpio_out", "nand", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC8", 2, 8, {"gpio_in", "gpio_out", "nand", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC9", 2, 9, {"gpio_in", "gpio_out", "nand", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC10", 2, 10, {"gpio_in", "gpio_out", "nand", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC11", 2, 11, {"gpio_in", "gpio_out", "nand", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC12", 2, 12, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC13", 2, 13, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC14", 2, 14, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC15", 2, 15, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC16", 2, 16, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC17", 2, 17, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC18", 2, 18, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC19", 2, 19, {"gpio_in", "gpio_out", "nand", "spi2", NULL, NULL, NULL, NULL}},
	+ {"PC20", 2, 20, {"gpio_in", "gpio_out", "nand", "spi2", NULL, NULL, NULL, NULL}},
	+ {"PC21", 2, 21, {"gpio_in", "gpio_out", "nand", "spi2", NULL, NULL, NULL, NULL}},
	+ {"PC22", 2, 22, {"gpio_in", "gpio_out", "nand", "spi2", NULL, NULL, NULL, NULL}},
	+ {"PC23", 2, 23, {"gpio_in", "gpio_out", "spi0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC24", 2, 24, {"gpio_in", "gpio_out", "nand", NULL, NULL, NULL, NULL, NULL}},
	+
	+ {"PD0", 3, 0, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD1", 3, 1, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD2", 3, 2, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD3", 3, 3, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD4", 3, 4, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD5", 3, 5, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD6", 3, 6, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD7", 3, 7, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD8", 3, 8, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD9", 3, 9, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD10", 3, 10, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD11", 3, 11, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD12", 3, 12, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD13", 3, 13, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD14", 3, 14, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD15", 3, 15, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD16", 3, 16, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD17", 3, 17, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD18", 3, 18, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD19", 3, 19, {"gpio_in", "gpio_out", "lcd0", "lvds1", NULL, NULL, NULL, NULL}},
	+ {"PD20", 3, 20, {"gpio_in", "gpio_out", "lcd0", "csi1", NULL, NULL, NULL, NULL}},
	+ {"PD21", 3, 21, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD22", 3, 22, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD23", 3, 23, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD24", 3, 24, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD25", 3, 25, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD26", 3, 26, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD27", 3, 27, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+
	+ {"PE0", 4, 0, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE1", 4, 1, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE2", 4, 2, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE3", 4, 3, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE4", 4, 4, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE5", 4, 5, {"gpio_in", "gpio_out", "ts0", "csi0", "sim", NULL, NULL, NULL}},
	+ {"PE6", 4, 6, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE7", 4, 7, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE8", 4, 8, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE9", 4, 9, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE10", 4, 10, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE11", 4, 11, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+
	+ {"PF0", 5, 0, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+ {"PF1", 5, 1, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+ {"PF2", 5, 2, {"gpio_in", "gpio_out", "mmc0", NULL, "uart0", NULL, NULL, NULL}},
	+ {"PF3", 5, 3, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+ {"PF4", 5, 4, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+ {"PF5", 5, 5, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+
	+ {"PG0", 6, 0, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", NULL, NULL, NULL}},
	+ {"PG1", 6, 1, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", NULL, NULL, NULL}},
	+ {"PG2", 6, 2, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", NULL, NULL, NULL}},
	+ {"PG3", 6, 3, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", NULL, NULL, NULL}},
	+ {"PG4", 6, 4, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", "csi0", NULL, NULL}},
	+ {"PG5", 6, 5, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", "csi0", NULL, NULL}},
	+ {"PG6", 6, 6, {"gpio_in", "gpio_out", "ts1", "csi1", "uart3", "csi0", NULL, NULL}},
	+ {"PG7", 6, 7, {"gpio_in", "gpio_out", "ts1", "csi1", "uart3", "csi0", NULL, NULL}},
	+ {"PG8", 6, 8, {"gpio_in", "gpio_out", "ts1", "csi1", "uart3", "csi0", NULL, NULL}},
	+ {"PG9", 6, 9, {"gpio_in", "gpio_out", "ts1", "csi1", "uart3", "csi0", NULL, NULL}},
	+ {"PG10", 6, 10, {"gpio_in", "gpio_out", "ts1", "csi1", "uart4", "csi0", NULL, NULL}},
	+ {"PG11", 6, 11, {"gpio_in", "gpio_out", "ts1", "csi1", "uart4", "csi0", NULL, NULL}},
	+
	+ {"PH0", 7, 0, {"gpio_in", "gpio_out", "lcd1", "pata", "uart3", NULL, "eint", "csi1"}},
	+ {"PH1", 7, 1, {"gpio_in", "gpio_out", "lcd1", "pata", "uart3", NULL, "eint", "csi1"}},
	+ {"PH2", 7, 2, {"gpio_in", "gpio_out", "lcd1", "pata", "uart3", NULL, "eint", "csi1"}},
	+ {"PH3", 7, 3, {"gpio_in", "gpio_out", "lcd1", "pata", "uart3", NULL, "eint", "csi1"}},
	+ {"PH4", 7, 4, {"gpio_in", "gpio_out", "lcd1", "pata", "uart4", NULL, "eint", "csi1"}},
	+ {"PH5", 7, 5, {"gpio_in", "gpio_out", "lcd1", "pata", "uart4", NULL, "eint", "csi1"}},
	+ {"PH6", 7, 6, {"gpio_in", "gpio_out", "lcd1", "pata", "uart5", "ms", "eint", "csi1"}},
	+ {"PH7", 7, 7, {"gpio_in", "gpio_out", "lcd1", "pata", "uart5", "ms", "eint", "csi1"}},
	+ {"PH8", 7, 8, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "ms", "eint", "csi1"}},
	+ {"PH9", 7, 9, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "ms", "eint", "csi1"}},
	+ {"PH10", 7, 10, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "ms", "eint", "csi1"}},
	+ {"PH11", 7, 11, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "ms", "eint", "csi1"}},
	+ {"PH12", 7, 12, {"gpio_in", "gpio_out", "lcd1", "pata", "ps2", NULL, "eint", "csi1"}},
	+ {"PH13", 7, 13, {"gpio_in", "gpio_out", "lcd1", "pata", "ps2", "sim", "eint", "csi1"}},
	+ {"PH14", 7, 14, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "sim", "eint", "csi1"}},
	+ {"PH15", 7, 15, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "sim", "eint", "csi1"}},
	+ {"PH16", 7, 16, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", NULL, "eint", "csi1"}},
	+ {"PH17", 7, 17, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "sim", "eint", "csi1"}},
	+ {"PH18", 7, 18, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "sim", "eint", "csi1"}},
	+ {"PH19", 7, 19, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "sim", "eint", "csi1"}},
	+ {"PH20", 7, 20, {"gpio_in", "gpio_out", "lcd1", "pata", "can", NULL, "eint", "csi1"}},
	+ {"PH21", 7, 21, {"gpio_in", "gpio_out", "lcd1", "pata", "can", NULL, "eint", "csi1"}},
	+ {"PH22", 7, 22, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH23", 7, 23, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH24", 7, 24, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH25", 7, 25, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH26", 7, 26, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH27", 7, 27, {"gpio_in", "gpio_out", "lcd1", "pata", "keypad", "mmc1", NULL, "csi1"}},
	+
	+ {"PI0", 8, 0, {"gpio_in", "gpio_out", NULL, NULL, NULL, NULL, NULL, NULL}},
	+ {"PI1", 8, 1, {"gpio_in", "gpio_out", NULL, NULL, NULL, NULL, NULL, NULL}},
	+ {"PI2", 8, 2, {"gpio_in", "gpio_out", NULL, NULL, NULL, NULL, NULL, NULL}},
	+ {"PI3", 8, 3, {"gpio_in", "gpio_out", "pwm", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI4", 8, 4, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI5", 8, 5, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI6", 8, 6, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI7", 8, 7, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI8", 8, 8, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI9", 8, 9, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI10", 8, 10, {"gpio_in", "gpio_out", "spi0", "uart5", NULL, NULL, "eint", NULL}},
	+ {"PI11", 8, 11, {"gpio_in", "gpio_out", "spi0", "uart5", NULL, NULL, "eint", NULL}},
	+ {"PI12", 8, 12, {"gpio_in", "gpio_out", "spi0", "uart6", NULL, NULL, "eint", NULL}},
	+ {"PI13", 8, 13, {"gpio_in", "gpio_out", "spi0", "uart6", NULL, NULL, "eint", NULL}},
	+ {"PI14", 8, 14, {"gpio_in", "gpio_out", "spi0", "ps2", "timer4", NULL, "eint", NULL}},
	+ {"PI15", 8, 15, {"gpio_in", "gpio_out", "spi1", "ps2", "timer5", NULL, "eint", NULL}},
	+ {"PI16", 8, 16, {"gpio_in", "gpio_out", "spi1", "uart2", NULL, NULL, "eint", NULL}},
	+ {"PI17", 8, 17, {"gpio_in", "gpio_out", "spi1", "uart2", NULL, NULL, "eint", NULL}},
	+ {"PI18", 8, 18, {"gpio_in", "gpio_out", "spi1", "uart2", NULL, NULL, "eint", NULL}},
	+ {"PI19", 8, 19, {"gpio_in", "gpio_out", "spi1", "uart2", NULL, NULL, "eint", NULL}},
	+ {"PI20", 8, 20, {"gpio_in", "gpio_out", "ps2", "uart7", "hdmi", NULL, NULL, NULL}},
	+ {"PI21", 8, 21, {"gpio_in", "gpio_out", "ps2", "uart7", "hdmi", NULL, NULL, NULL}},
	+};
	+
	+const struct allwinner_padconf a10_padconf = {
	+ .npins = sizeof(a10_pins) / sizeof(struct allwinner_pins),
	+ .pins = a10_pins,
	+};
	Index: sys/arm/allwinner/a20/a20_if_dwc.c
	===================================================================
	--- sys/arm/allwinner/a20/a20_if_dwc.c
	+++ sys/arm/allwinner/a20/a20_if_dwc.c
	@@ -41,7 +41,6 @@
	#include <dev/ofw/ofw_bus_subr.h>

	#include <arm/allwinner/a10_clk.h>
	-#include <arm/allwinner/a10_gpio.h>

	#include "if_dwc_if.h"

	@@ -63,8 +62,7 @@
	{

	/* Activate GMAC clock and set the pin mux to rgmii. */
	- if (a10_clk_gmac_activate(ofw_bus_get_node(dev)) != 0 \|\|
	- a10_gpio_ethernet_activate(A10_GPIO_FUNC_RGMII)) {
	+ if (a10_clk_gmac_activate(ofw_bus_get_node(dev)) != 0) {
	device_printf(dev, "could not activate gmac module\n");
	return (ENXIO);
	}
	Index: sys/arm/allwinner/a20/std.a20
	===================================================================
	--- sys/arm/allwinner/a20/std.a20
	+++ sys/arm/allwinner/a20/std.a20
	@@ -13,5 +13,7 @@
	options IPI_IRQ_START=0
	options IPI_IRQ_END=15

	+device fdt_pinctrl
	+
	files "../allwinner/files.allwinner"
	files "../allwinner/a20/files.a20"
	Index: sys/arm/allwinner/a20_padconf.c
	===================================================================
	--- /dev/null
	+++ sys/arm/allwinner/a20_padconf.c
	@@ -0,0 +1,224 @@
	+/*-
	+ * Copyright (c) 2016 Emmanuel Vadot <manu@bidouilliste.com>
	+ * All rights reserved.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ */
	+
	+#include <sys/param.h>
	+#include <sys/systm.h>
	+#include <sys/kernel.h>
	+#include <sys/types.h>
	+
	+#include <arm/allwinner/allwinner_pinctrl.h>
	+
	+const static struct allwinner_pins a20_pins[] = {
	+ {"PA0", 0, 0, {"gpio_in", "gpio_out", "emac", "spi1", "uart2", "gmac", NULL, NULL}},
	+ {"PA1", 0, 1, {"gpio_in", "gpio_out", "emac", "spi1", "uart2", "gmac", NULL, NULL}},
	+ {"PA2", 0, 2, {"gpio_in", "gpio_out", "emac", "spi1", "uart2", "gmac", NULL, NULL}},
	+ {"PA3", 0, 3, {"gpio_in", "gpio_out", "emac", "spi1", "uart2", "gmac", NULL, NULL}},
	+ {"PA4", 0, 4, {"gpio_in", "gpio_out", "emac", "spi1", NULL, "gmac", NULL, NULL}},
	+ {"PA5", 0, 5, {"gpio_in", "gpio_out", "emac", "spi3", NULL, "gmac", NULL, NULL}},
	+ {"PA6", 0, 6, {"gpio_in", "gpio_out", "emac", "spi3", NULL, "gmac", NULL, NULL}},
	+ {"PA7", 0, 7, {"gpio_in", "gpio_out", "emac", "spi3", NULL, "gmac", NULL, NULL}},
	+ {"PA8", 0, 8, {"gpio_in", "gpio_out", "emac", "spi3", NULL, "gmac", NULL, NULL}},
	+ {"PA9", 0, 9, {"gpio_in", "gpio_out", "emac", "spi3", NULL, "gmac", "i2c1", NULL}},
	+ {"PA10", 0, 10, {"gpio_in", "gpio_out", "emac", NULL, "uart1", "gmac", NULL, NULL}},
	+ {"PA11", 0, 11, {"gpio_in", "gpio_out", "emac", NULL, "uart1", "gmac", NULL, NULL}},
	+ {"PA12", 0, 12, {"gpio_in", "gpio_out", "emac", "uart6", "uart1", "gmac", NULL, NULL}},
	+ {"PA13", 0, 13, {"gpio_in", "gpio_out", "emac", "uart6", "uart1", "gmac", NULL, NULL}},
	+ {"PA14", 0, 14, {"gpio_in", "gpio_out", "emac", "uart7", "uart1", "gmac", "i2c1", NULL}},
	+ {"PA15", 0, 15, {"gpio_in", "gpio_out", "emac", "uart7", "uart1", "gmac", "i2c1", NULL}},
	+ {"PA16", 0, 16, {"gpio_in", "gpio_out", NULL, "can", "uart1", "gmac", "i2c1", NULL}},
	+ {"PA17", 0, 17, {"gpio_in", "gpio_out", NULL, "can", "uart1", "gmac", "i2c1", NULL}},
	+
	+ {"PB0", 1, 0, {"gpio_in", "gpio_out", "i2c0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB1", 1, 1, {"gpio_in", "gpio_out", "i2c0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB2", 1, 2, {"gpio_in", "gpio_out", "pwm", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB3", 1, 3, {"gpio_in", "gpio_out", "ir0", NULL, "spdif", NULL, NULL, NULL}},
	+ {"PB4", 1, 4, {"gpio_in", "gpio_out", "ir0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB5", 1, 5, {"gpio_in", "gpio_out", "i2s0", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB6", 1, 6, {"gpio_in", "gpio_out", "i2c0", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB7", 1, 7, {"gpio_in", "gpio_out", "i2c0", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB8", 1, 8, {"gpio_in", "gpio_out", "i2c0", "ac97", NULL, NULL, NULL, NULL}},
	+ {"PB9", 1, 9, {"gpio_in", "gpio_out", "i2c0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB10", 1, 10, {"gpio_in", "gpio_out", "i2c0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB11", 1, 11, {"gpio_in", "gpio_out", "i2c0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB12", 1, 12, {"gpio_in", "gpio_out", "i2c0", "ac97", "spdif", NULL, NULL, NULL}},
	+ {"PB13", 1, 13, {"gpio_in", "gpio_out", "spi2", NULL, "spdif", NULL, NULL, NULL}},
	+ {"PB14", 1, 14, {"gpio_in", "gpio_out", "spi2", "jtag", NULL, NULL, NULL, NULL}},
	+ {"PB15", 1, 15, {"gpio_in", "gpio_out", "spi2", "jtag", NULL, NULL, NULL, NULL}},
	+ {"PB16", 1, 16, {"gpio_in", "gpio_out", "spi2", "jtag", NULL, NULL, NULL, NULL}},
	+ {"PB17", 1, 17, {"gpio_in", "gpio_out", "spi2", "jtag", NULL, NULL, NULL, NULL}},
	+ {"PB18", 1, 18, {"gpio_in", "gpio_out", "i2c1", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB19", 1, 19, {"gpio_in", "gpio_out", "i2c1", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB20", 1, 20, {"gpio_in", "gpio_out", "i2c2", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB21", 1, 21, {"gpio_in", "gpio_out", "i2c2", NULL, NULL, NULL, NULL, NULL}},
	+ {"PB22", 1, 22, {"gpio_in", "gpio_out", "uart0", "ir1", NULL, NULL, NULL, NULL}},
	+ {"PB23", 1, 23, {"gpio_in", "gpio_out", "uart0", "ir1", NULL, NULL, NULL, NULL}},
	+
	+ {"PC0", 2, 0, {"gpio_in", "gpio_out", "nand0", "spi0", NULL, NULL, NULL, NULL}},
	+ {"PC1", 2, 1, {"gpio_in", "gpio_out", "nand0", "spi0", NULL, NULL, NULL, NULL}},
	+ {"PC2", 2, 2, {"gpio_in", "gpio_out", "nand0", "spi0", NULL, NULL, NULL, NULL}},
	+ {"PC3", 2, 3, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC4", 2, 4, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC5", 2, 5, {"gpio_in", "gpio_out", "nand0", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC6", 2, 6, {"gpio_in", "gpio_out", "nand0", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC7", 2, 7, {"gpio_in", "gpio_out", "nand0", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC8", 2, 8, {"gpio_in", "gpio_out", "nand0", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC9", 2, 9, {"gpio_in", "gpio_out", "nand0", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC10", 2, 10, {"gpio_in", "gpio_out", "nand0", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC11", 2, 11, {"gpio_in", "gpio_out", "nand0", "mmc2", NULL, NULL, NULL, NULL}},
	+ {"PC12", 2, 12, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC13", 2, 13, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC14", 2, 14, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC15", 2, 15, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC16", 2, 16, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC17", 2, 17, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC18", 2, 18, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+ {"PC19", 2, 19, {"gpio_in", "gpio_out", "nand0", "spi2", NULL, NULL, "eint", NULL}},
	+ {"PC20", 2, 20, {"gpio_in", "gpio_out", "nand0", "spi2", NULL, NULL, "eint", NULL}},
	+ {"PC21", 2, 21, {"gpio_in", "gpio_out", "nand0", "spi2", NULL, NULL, "eint", NULL}},
	+ {"PC22", 2, 22, {"gpio_in", "gpio_out", "nand0", "spi2", NULL, NULL, "eint", NULL}},
	+ {"PC23", 2, 23, {"gpio_in", "gpio_out", NULL, "spi0", NULL, NULL, NULL, NULL}},
	+ {"PC24", 2, 24, {"gpio_in", "gpio_out", "nand0", NULL, NULL, NULL, NULL, NULL}},
	+
	+ {"PD0", 3, 0, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD1", 3, 1, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD2", 3, 2, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD3", 3, 3, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD4", 3, 4, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD5", 3, 5, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD6", 3, 6, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD7", 3, 7, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD8", 3, 8, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD9", 3, 9, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD10", 3, 10, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD11", 3, 11, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD12", 3, 12, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD13", 3, 13, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD14", 3, 14, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD15", 3, 15, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD16", 3, 16, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD17", 3, 17, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD18", 3, 18, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD19", 3, 19, {"gpio_in", "gpio_out", "lcd0", "lvds0", NULL, NULL, NULL, NULL}},
	+ {"PD20", 3, 20, {"gpio_in", "gpio_out", "lcd0", "csi1", NULL, NULL, NULL, NULL}},
	+ {"PD21", 3, 21, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD22", 3, 22, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD23", 3, 23, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD24", 3, 24, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD25", 3, 25, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD26", 3, 26, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+ {"PD27", 3, 27, {"gpio_in", "gpio_out", "lcd0", "sim", NULL, NULL, NULL, NULL}},
	+
	+ {"PE0", 4, 0, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE1", 4, 1, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE2", 4, 2, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE3", 4, 3, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE4", 4, 4, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE5", 4, 5, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE6", 4, 6, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE7", 4, 7, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE8", 4, 8, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE9", 4, 9, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE10", 4, 10, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+ {"PE11", 4, 11, {"gpio_in", "gpio_out", "ts0", "csi0", NULL, NULL, NULL, NULL}},
	+
	+ {"PF0", 5, 0, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+ {"PF1", 5, 1, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+ {"PF2", 5, 2, {"gpio_in", "gpio_out", "mmc0", NULL, "uart0", NULL, NULL, NULL}},
	+ {"PF3", 5, 3, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+ {"PF4", 5, 4, {"gpio_in", "gpio_out", "mmc0", NULL, "uart0", NULL, NULL, NULL}},
	+ {"PF5", 5, 5, {"gpio_in", "gpio_out", "mmc0", NULL, "jtag", NULL, NULL, NULL}},
	+
	+ {"PG0", 6, 0, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", NULL, NULL, NULL}},
	+ {"PG1", 6, 1, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", NULL, NULL, NULL}},
	+ {"PG2", 6, 2, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", NULL, NULL, NULL}},
	+ {"PG3", 6, 3, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", NULL, NULL, NULL}},
	+ {"PG4", 6, 4, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", "csi0", NULL, NULL}},
	+ {"PG5", 6, 5, {"gpio_in", "gpio_out", "ts1", "csi1", "mmc1", "csi0", NULL, NULL}},
	+ {"PG6", 6, 6, {"gpio_in", "gpio_out", "ts1", "csi1", "uart3", "csi0", NULL, NULL}},
	+ {"PG7", 6, 7, {"gpio_in", "gpio_out", "ts1", "csi1", "uart3", "csi0", NULL, NULL}},
	+ {"PG8", 6, 8, {"gpio_in", "gpio_out", "ts1", "csi1", "uart3", "csi0", NULL, NULL}},
	+ {"PG9", 6, 9, {"gpio_in", "gpio_out", "ts1", "csi1", "uart3", "csi0", NULL, NULL}},
	+ {"PG10", 6, 10, {"gpio_in", "gpio_out", "ts1", "csi1", "uart4", "csi0", NULL, NULL}},
	+ {"PG11", 6, 11, {"gpio_in", "gpio_out", "ts1", "csi1", "uart4", "csi0", NULL, NULL}},
	+
	+ {"PH0", 7, 0, {"gpio_in", "gpio_out", "lcd1", NULL, "uart3", NULL, "eint", "csi1"}},
	+ {"PH1", 7, 1, {"gpio_in", "gpio_out", "lcd1", NULL, "uart3", NULL, "eint", "csi1"}},
	+ {"PH2", 7, 2, {"gpio_in", "gpio_out", "lcd1", NULL, "uart3", NULL, "eint", "csi1"}},
	+ {"PH3", 7, 3, {"gpio_in", "gpio_out", "lcd1", NULL, "uart3", NULL, "eint", "csi1"}},
	+ {"PH4", 7, 4, {"gpio_in", "gpio_out", "lcd1", NULL, "uart4", NULL, "eint", "csi1"}},
	+ {"PH5", 7, 5, {"gpio_in", "gpio_out", "lcd1", NULL, "uart4", NULL, "eint", "csi1"}},
	+ {"PH6", 7, 6, {"gpio_in", "gpio_out", "lcd1", NULL, "uart5", "ms", "eint", "csi1"}},
	+ {"PH7", 7, 7, {"gpio_in", "gpio_out", "lcd1", NULL, "uart5", "ms", "eint", "csi1"}},
	+ {"PH8", 7, 8, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "ms", "eint", "csi1"}},
	+ {"PH9", 7, 9, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "ms", "eint", "csi1"}},
	+ {"PH10", 7, 10, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "ms", "eint", "csi1"}},
	+ {"PH11", 7, 11, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "ms", "eint", "csi1"}},
	+ {"PH12", 7, 12, {"gpio_in", "gpio_out", "lcd1", NULL, "ps2", NULL, "eint", "csi1"}},
	+ {"PH13", 7, 13, {"gpio_in", "gpio_out", "lcd1", NULL, "ps2", "sim", "eint", "csi1"}},
	+ {"PH14", 7, 14, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "sim", "eint", "csi1"}},
	+ {"PH15", 7, 15, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "sim", "eint", "csi1"}},
	+ {"PH16", 7, 16, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "sim", "eint", "csi1"}},
	+ {"PH17", 7, 17, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "sim", "eint", "csi1"}},
	+ {"PH18", 7, 18, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "sim", "eint", "csi1"}},
	+ {"PH19", 7, 19, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "sim", "eint", "csi1"}},
	+ {"PH20", 7, 20, {"gpio_in", "gpio_out", "lcd1", NULL, "can", NULL, "eint", "csi1"}},
	+ {"PH21", 7, 21, {"gpio_in", "gpio_out", "lcd1", NULL, "can", NULL, "eint", "csi1"}},
	+ {"PH22", 7, 22, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH23", 7, 23, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH24", 7, 24, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH25", 7, 25, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH26", 7, 26, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "mmc1", NULL, "csi1"}},
	+ {"PH27", 7, 27, {"gpio_in", "gpio_out", "lcd1", NULL, "keypad", "mmc1", NULL, "csi1"}},
	+
	+ {"PI0", 8, 0, {"gpio_in", "gpio_out", NULL, "i2c3", NULL, NULL, NULL, NULL}},
	+ {"PI1", 8, 1, {"gpio_in", "gpio_out", NULL, "i2c3", NULL, NULL, NULL, NULL}},
	+ {"PI2", 8, 2, {"gpio_in", "gpio_out", NULL, "i2c4", NULL, NULL, NULL, NULL}},
	+ {"PI3", 8, 3, {"gpio_in", "gpio_out", "pwm", "i2c4", NULL, NULL, NULL, NULL}},
	+ {"PI4", 8, 4, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI5", 8, 5, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI6", 8, 6, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI7", 8, 7, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI8", 8, 8, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI9", 8, 9, {"gpio_in", "gpio_out", "mmc3", NULL, NULL, NULL, NULL, NULL}},
	+ {"PI10", 8, 10, {"gpio_in", "gpio_out", "spi0", "uart5", NULL, NULL, "eint", NULL}},
	+ {"PI11", 8, 11, {"gpio_in", "gpio_out", "spi0", "uart5", NULL, NULL, "eint", NULL}},
	+ {"PI12", 8, 12, {"gpio_in", "gpio_out", "spi0", "uart6", "clk_out_a", NULL, "eint", NULL}},
	+ {"PI13", 8, 13, {"gpio_in", "gpio_out", "spi0", "uart6", "clk_out_b", NULL, "eint", NULL}},
	+ {"PI14", 8, 14, {"gpio_in", "gpio_out", "spi0", "ps2", "timer4", NULL, "eint", NULL}},
	+ {"PI15", 8, 15, {"gpio_in", "gpio_out", "spi1", "ps2", "timer5", NULL, "eint", NULL}},
	+ {"PI16", 8, 16, {"gpio_in", "gpio_out", "spi1", "uart2", NULL, NULL, "eint", NULL}},
	+ {"PI17", 8, 17, {"gpio_in", "gpio_out", "spi1", "uart2", NULL, NULL, "eint", NULL}},
	+ {"PI18", 8, 18, {"gpio_in", "gpio_out", "spi1", "uart2", NULL, NULL, "eint", NULL}},
	+ {"PI19", 8, 19, {"gpio_in", "gpio_out", "spi1", "uart2", NULL, NULL, "eint", NULL}},
	+ {"PI20", 8, 20, {"gpio_in", "gpio_out", "ps2", "uart7", "hdmi", NULL, NULL, NULL}},
	+ {"PI21", 8, 21, {"gpio_in", "gpio_out", "ps2", "uart7", "hdmi", NULL, NULL, NULL}},
	+};
	+
	+const struct allwinner_padconf a20_padconf = {
	+ .npins = sizeof(a20_pins) / sizeof(struct allwinner_pins),
	+ .pins = a20_pins,
	+};
	Index: sys/arm/allwinner/allwinner_pinctrl.h
	===================================================================
	--- sys/arm/allwinner/allwinner_pinctrl.h
	+++ sys/arm/allwinner/allwinner_pinctrl.h
	@@ -1,5 +1,5 @@
	/*-
	- * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
	+ * Copyright (c) 2016 Emmanuel Vadot <manu@bidouilliste.com>
	* All rights reserved.
	*
	* Redistribution and use in source and binary forms, with or without
	@@ -17,21 +17,27 @@
	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.
	*
	- * $FreeBSD$
	*/

	-#ifndef _A10_GPIO_H_
	-#define _A10_GPIO_H_
	+#ifndef _ALLWINNER_PINCTRL_H_
	+#define _ALLWINNER_PINCTRL_H_

	-#define A10_GPIO_FUNC_MII 2
	-#define A10_GPIO_FUNC_RGMII 5
	+struct allwinner_pins {
	+ const char *name;
	+ uint8_t port;
	+ uint8_t pin;
	+ const char *functions[8];
	+};

	-int a10_gpio_ethernet_activate(uint32_t);
	+struct allwinner_padconf {
	+ uint32_t npins;
	+ const struct allwinner_pins * pins;
	+};

	-#endif
	+#endif /* _ALLWINNER_PINCTRL_H_ */
	Index: sys/arm/allwinner/files.allwinner
	===================================================================
	--- sys/arm/allwinner/files.allwinner
	+++ sys/arm/allwinner/files.allwinner
	@@ -7,8 +7,10 @@
	arm/allwinner/a10_ehci.c optional ehci
	arm/allwinner/a10_gpio.c optional gpio
	arm/allwinner/a10_mmc.c optional mmc
	+arm/allwinner/a10_padconf.c standard
	arm/allwinner/a10_sramc.c standard
	arm/allwinner/a10_wdog.c standard
	+arm/allwinner/a20_padconf.c standard
	arm/allwinner/a20/a20_cpu_cfg.c standard
	arm/allwinner/allwinner_machdep.c standard
	arm/allwinner/if_emac.c optional emac
	Index: sys/arm/allwinner/if_emac.c
	===================================================================
	--- sys/arm/allwinner/if_emac.c
	+++ sys/arm/allwinner/if_emac.c
	@@ -84,7 +84,6 @@

	#include "a10_clk.h"
	#include "a10_sramc.h"
	-#include "a10_gpio.h"

	struct emac_softc {
	struct ifnet *emac_ifp;
	@@ -145,8 +144,6 @@

	/* Activate EMAC clock. */
	a10_clk_emac_activate();
	- /* Set the pin mux to EMAC (mii). */
	- a10_gpio_ethernet_activate(A10_GPIO_FUNC_MII);
	/* Map sram. */
	a10_map_to_emac();
	}
	Index: sys/arm/allwinner/std.a10
	===================================================================
	--- sys/arm/allwinner/std.a10
	+++ sys/arm/allwinner/std.a10
	@@ -10,5 +10,7 @@

	options ARM_L2_PIPT

	+device fdt_pinctrl
	+
	files "../allwinner/files.allwinner"
	files "../allwinner/files.a10"
	Index: sys/boot/fdt/dts/arm/bananapi.dts
	===================================================================
	--- sys/boot/fdt/dts/arm/bananapi.dts
	+++ sys/boot/fdt/dts/arm/bananapi.dts
	@@ -28,7 +28,7 @@

	/dts-v1/;

	-/include/ "sun7i-a20.dtsi"
	+#include "sun7i-a20.dtsi"

	#include <dt-bindings/gpio/gpio.h>

	@@ -67,6 +67,8 @@
	gmac@01c50000 {
	phy-type = "rgmii-bpi";
	status = "okay";
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&gmac_pins_rgmii>;
	};

	ahci: sata@01c18000 {
	Index: sys/boot/fdt/dts/arm/cubieboard.dts
	===================================================================
	--- sys/boot/fdt/dts/arm/cubieboard.dts
	+++ sys/boot/fdt/dts/arm/cubieboard.dts
	@@ -28,7 +28,7 @@

	/dts-v1/;

	-/include/ "sun4i-a10.dtsi"
	+#include "sun4i-a10.dtsi"

	/ {
	model = "Cubietech Cubieboard";
	@@ -63,6 +63,8 @@

	emac@01c0b000 {
	status = "okay";
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&emac_pins>;
	};

	ahci: sata@01c18000 {
	Index: sys/boot/fdt/dts/arm/cubieboard2.dts
	===================================================================
	--- sys/boot/fdt/dts/arm/cubieboard2.dts
	+++ sys/boot/fdt/dts/arm/cubieboard2.dts
	@@ -28,7 +28,7 @@

	/dts-v1/;

	-/include/ "sun7i-a20.dtsi"
	+#include "sun7i-a20.dtsi"

	#include <dt-bindings/gpio/gpio.h>

	@@ -69,6 +69,8 @@

	gmac@01c50000 {
	status = "okay";
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&gmac_pins_rgmii>;
	};

	ahci: sata@01c18000 {
	Index: sys/boot/fdt/dts/arm/sun4i-a10.dtsi
	===================================================================
	--- sys/boot/fdt/dts/arm/sun4i-a10.dtsi
	+++ sys/boot/fdt/dts/arm/sun4i-a10.dtsi
	@@ -26,6 +26,8 @@
	* $FreeBSD$
	*/

	+#include <dt-bindings/pinctrl/sun4i-a10.h>
	+
	/ {
	compatible = "allwinner,sun4i-a10";
	#address-cells = <1>;
	@@ -87,6 +89,17 @@
	reg =< 0x01c20800 0x400 >;
	interrupts = < 28 >;
	interrupt-parent = <&AINTC>;
	+
	+ emac_pins: emac@0 {
	+ allwinner,pins = "PA0", "PA1", "PA2", "PA3",
	+ "PA4", "PA5", "PA6", "PA7",
	+ "PA8", "PA9", "PA10", "PA11",
	+ "PA12", "PA13", "PA14", "PA15",
	+ "PA16";
	+ allwinner,function = "emac";
	+ allwinner,drive = <SUN4I_PINCTRL_10_MA>;
	+ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	+ };
	};

	usb1: usb@01c14000 {
	Index: sys/boot/fdt/dts/arm/sun7i-a20.dtsi
	===================================================================
	--- sys/boot/fdt/dts/arm/sun7i-a20.dtsi
	+++ sys/boot/fdt/dts/arm/sun7i-a20.dtsi
	@@ -26,6 +26,8 @@
	* $FreeBSD$
	*/

	+#include <dt-bindings/pinctrl/sun4i-a10.h>
	+
	/ {
	compatible = "allwinner,sun7i-a20";
	#address-cells = <1>;
	@@ -93,6 +95,28 @@
	reg =< 0x01c20800 0x400 >;
	interrupts = < 28 >;
	interrupt-parent = <&GIC>;
	+
	+ gmac_pins_mii: gmac_mii@0 {
	+ allwinner,pins = "PA0", "PA1", "PA2", "PA3",
	+ "PA4", "PA5", "PA6", "PA7",
	+ "PA8", "PA9", "PA10", "PA11",
	+ "PA12", "PA13", "PA14", "PA15",
	+ "PA16";
	+ allwinner,function = "gmac";
	+ allwinner,drive = <SUN4I_PINCTRL_10_MA>;
	+ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	+ };
	+
	+ gmac_pins_rgmii: gmac_rgmii@0 {
	+ allwinner,pins = "PA0", "PA1", "PA2", "PA3",
	+ "PA4", "PA5", "PA6", "PA7",
	+ "PA8", "PA10", "PA11", "PA12",
	+ "PA13", "PA15", "PA16";
	+ allwinner,function = "gmac";
	+ allwinner,drive = <SUN4I_PINCTRL_40_MA>;
	+ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	+ };
	+
	};

	usb1: usb@01c14000 {

File Metadata

Mime Type: text/plain
Expires: Tue, Mar 17, 10:22 PM (12 h, 24 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 29855253
Default Alt Text: D5177.id12971.diff (50 KB)

D5177.id12971.diffNo OneTemporaryActions

D5177.id12971.diffView Options

File Metadata

Event Timeline

D5177.id12971.diff
No OneTemporary
Actions

D5177.id12971.diff
View Options