Index: head/sys/arm/altera/socfpga/socfpga_gpio.c
===================================================================
--- head/sys/arm/altera/socfpga/socfpga_gpio.c (revision 351816)
+++ head/sys/arm/altera/socfpga/socfpga_gpio.c (nonexistent)
@@ -1,453 +0,0 @@
-/*-
- * Copyright (c) 2015 Ruslan Bukin
- * All rights reserved.
- *
- * This software was developed by SRI International and the University of
- * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
- * ("CTSRD"), as part of the DARPA CRASH research programme.
- *
- * 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.
- */
-
-/*
- * SOCFPGA General-Purpose I/O Interface.
- * Chapter 22, Cyclone V Device Handbook (CV-5V2 2014.07.22)
- */
-
-/*
- * The GPIO modules are instances of the Synopsys® DesignWare® APB General
- * Purpose Programming I/O (DW_apb_gpio) peripheral.
- */
-
-#include
-__FBSDID("$FreeBSD$");
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include "gpio_if.h"
-
-#define READ4(_sc, _reg) \
- bus_read_4((_sc)->res[0], _reg)
-#define WRITE4(_sc, _reg, _val) \
- bus_write_4((_sc)->res[0], _reg, _val)
-
-#define GPIO_SWPORTA_DR 0x00 /* Port A Data Register */
-#define GPIO_SWPORTA_DDR 0x04 /* Port A Data Direction Register */
-#define GPIO_INTEN 0x30 /* Interrupt Enable Register */
-#define GPIO_INTMASK 0x34 /* Interrupt Mask Register */
-#define GPIO_INTTYPE_LEVEL 0x38 /* Interrupt Level Register */
-#define GPIO_INT_POLARITY 0x3C /* Interrupt Polarity Register */
-#define GPIO_INTSTATUS 0x40 /* Interrupt Status Register */
-#define GPIO_RAW_INTSTATUS 0x44 /* Raw Interrupt Status Register */
-#define GPIO_DEBOUNCE 0x48 /* Debounce Enable Register */
-#define GPIO_PORTA_EOI 0x4C /* Clear Interrupt Register */
-#define GPIO_EXT_PORTA 0x50 /* External Port A Register */
-#define GPIO_LS_SYNC 0x60 /* Synchronization Level Register */
-#define GPIO_ID_CODE 0x64 /* ID Code Register */
-#define GPIO_VER_ID_CODE 0x6C /* GPIO Version Register */
-#define GPIO_CONFIG_REG2 0x70 /* Configuration Register 2 */
-#define ENCODED_ID_PWIDTH_M 0x1f /* Width of GPIO Port N Mask */
-#define ENCODED_ID_PWIDTH_S(n) (5 * n) /* Width of GPIO Port N Shift */
-#define GPIO_CONFIG_REG1 0x74 /* Configuration Register 1 */
-
-enum port_no {
- PORTA,
- PORTB,
- PORTC,
- PORTD,
-};
-
-#define NR_GPIO_MAX 32 /* Maximum pins per port */
-
-#define GPIO_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
-#define GPIO_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
-
-#define DEFAULT_CAPS (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)
-
-/*
- * GPIO interface
- */
-static device_t socfpga_gpio_get_bus(device_t);
-static int socfpga_gpio_pin_max(device_t, int *);
-static int socfpga_gpio_pin_getcaps(device_t, uint32_t, uint32_t *);
-static int socfpga_gpio_pin_getname(device_t, uint32_t, char *);
-static int socfpga_gpio_pin_getflags(device_t, uint32_t, uint32_t *);
-static int socfpga_gpio_pin_setflags(device_t, uint32_t, uint32_t);
-static int socfpga_gpio_pin_set(device_t, uint32_t, unsigned int);
-static int socfpga_gpio_pin_get(device_t, uint32_t, unsigned int *);
-static int socfpga_gpio_pin_toggle(device_t, uint32_t pin);
-
-struct socfpga_gpio_softc {
- struct resource *res[1];
- bus_space_tag_t bst;
- bus_space_handle_t bsh;
-
- device_t dev;
- device_t busdev;
- struct mtx sc_mtx;
- int gpio_npins;
- struct gpio_pin gpio_pins[NR_GPIO_MAX];
-};
-
-struct socfpga_gpio_softc *gpio_sc;
-
-static struct resource_spec socfpga_gpio_spec[] = {
- { SYS_RES_MEMORY, 0, RF_ACTIVE },
- { -1, 0 }
-};
-
-static int
-socfpga_gpio_probe(device_t dev)
-{
-
- if (!ofw_bus_status_okay(dev))
- return (ENXIO);
-
- if (!ofw_bus_is_compatible(dev, "snps,dw-apb-gpio"))
- return (ENXIO);
-
- device_set_desc(dev, "DesignWare General-Purpose I/O Interface");
- return (BUS_PROBE_DEFAULT);
-}
-
-static int
-socfpga_gpio_attach(device_t dev)
-{
- struct socfpga_gpio_softc *sc;
- int version;
- int nr_pins;
- int cfg2;
- int i;
-
- sc = device_get_softc(dev);
- sc->dev = dev;
- mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
-
- if (bus_alloc_resources(dev, socfpga_gpio_spec, sc->res)) {
- device_printf(dev, "could not allocate resources\n");
- mtx_destroy(&sc->sc_mtx);
- return (ENXIO);
- }
-
- /* Memory interface */
- sc->bst = rman_get_bustag(sc->res[0]);
- sc->bsh = rman_get_bushandle(sc->res[0]);
-
- gpio_sc = sc;
-
- version = READ4(sc, GPIO_VER_ID_CODE);
-#if 0
- device_printf(sc->dev, "Version = 0x%08x\n", version);
-#endif
-
- /*
- * Take number of pins from hardware.
- * XXX: Assume we have GPIO port A only.
- */
- cfg2 = READ4(sc, GPIO_CONFIG_REG2);
- nr_pins = (cfg2 >> ENCODED_ID_PWIDTH_S(PORTA)) & \
- ENCODED_ID_PWIDTH_M;
- sc->gpio_npins = nr_pins + 1;
-
- for (i = 0; i < sc->gpio_npins; i++) {
- sc->gpio_pins[i].gp_pin = i;
- sc->gpio_pins[i].gp_caps = DEFAULT_CAPS;
- sc->gpio_pins[i].gp_flags =
- (READ4(sc, GPIO_SWPORTA_DDR) & (1 << i)) ?
- GPIO_PIN_OUTPUT: GPIO_PIN_INPUT;
- snprintf(sc->gpio_pins[i].gp_name, GPIOMAXNAME,
- "socfpga_gpio%d.%d", device_get_unit(dev), i);
- }
- sc->busdev = gpiobus_attach_bus(dev);
- if (sc->busdev == NULL) {
- bus_release_resources(dev, socfpga_gpio_spec, sc->res);
- mtx_destroy(&sc->sc_mtx);
- return (ENXIO);
- }
-
- return (0);
-}
-
-static device_t
-socfpga_gpio_get_bus(device_t dev)
-{
- struct socfpga_gpio_softc *sc;
-
- sc = device_get_softc(dev);
-
- return (sc->busdev);
-}
-
-static int
-socfpga_gpio_pin_max(device_t dev, int *maxpin)
-{
- struct socfpga_gpio_softc *sc;
-
- sc = device_get_softc(dev);
-
- *maxpin = sc->gpio_npins - 1;
-
- return (0);
-}
-
-static int
-socfpga_gpio_pin_getname(device_t dev, uint32_t pin, char *name)
-{
- struct socfpga_gpio_softc *sc;
- int i;
-
- sc = device_get_softc(dev);
- for (i = 0; i < sc->gpio_npins; i++) {
- if (sc->gpio_pins[i].gp_pin == pin)
- break;
- }
-
- if (i >= sc->gpio_npins)
- return (EINVAL);
-
- GPIO_LOCK(sc);
- memcpy(name, sc->gpio_pins[i].gp_name, GPIOMAXNAME);
- GPIO_UNLOCK(sc);
-
- return (0);
-}
-
-static int
-socfpga_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps)
-{
- struct socfpga_gpio_softc *sc;
- int i;
-
- sc = device_get_softc(dev);
- for (i = 0; i < sc->gpio_npins; i++) {
- if (sc->gpio_pins[i].gp_pin == pin)
- break;
- }
-
- if (i >= sc->gpio_npins)
- return (EINVAL);
-
- GPIO_LOCK(sc);
- *caps = sc->gpio_pins[i].gp_caps;
- GPIO_UNLOCK(sc);
-
- return (0);
-}
-
-static int
-socfpga_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags)
-{
- struct socfpga_gpio_softc *sc;
- int i;
-
- sc = device_get_softc(dev);
- for (i = 0; i < sc->gpio_npins; i++) {
- if (sc->gpio_pins[i].gp_pin == pin)
- break;
- }
-
- if (i >= sc->gpio_npins)
- return (EINVAL);
-
- GPIO_LOCK(sc);
- *flags = sc->gpio_pins[i].gp_flags;
- GPIO_UNLOCK(sc);
-
- return (0);
-}
-
-static int
-socfpga_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val)
-{
- struct socfpga_gpio_softc *sc;
- int i;
-
- sc = device_get_softc(dev);
- for (i = 0; i < sc->gpio_npins; i++) {
- if (sc->gpio_pins[i].gp_pin == pin)
- break;
- }
-
- if (i >= sc->gpio_npins)
- return (EINVAL);
-
- GPIO_LOCK(sc);
- *val = (READ4(sc, GPIO_EXT_PORTA) & (1 << i)) ? 1 : 0;
- GPIO_UNLOCK(sc);
-
- return (0);
-}
-
-static int
-socfpga_gpio_pin_toggle(device_t dev, uint32_t pin)
-{
- struct socfpga_gpio_softc *sc;
- int reg;
- int i;
-
- sc = device_get_softc(dev);
- for (i = 0; i < sc->gpio_npins; i++) {
- if (sc->gpio_pins[i].gp_pin == pin)
- break;
- }
-
- if (i >= sc->gpio_npins)
- return (EINVAL);
-
- GPIO_LOCK(sc);
- reg = READ4(sc, GPIO_SWPORTA_DR);
- if (reg & (1 << i))
- reg &= ~(1 << i);
- else
- reg |= (1 << i);
- WRITE4(sc, GPIO_SWPORTA_DR, reg);
- GPIO_UNLOCK(sc);
-
- return (0);
-}
-
-
-static void
-socfpga_gpio_pin_configure(struct socfpga_gpio_softc *sc,
- struct gpio_pin *pin, unsigned int flags)
-{
- int reg;
-
- GPIO_LOCK(sc);
-
- /*
- * Manage input/output
- */
-
- reg = READ4(sc, GPIO_SWPORTA_DDR);
- if (flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
- pin->gp_flags &= ~(GPIO_PIN_INPUT|GPIO_PIN_OUTPUT);
- if (flags & GPIO_PIN_OUTPUT) {
- pin->gp_flags |= GPIO_PIN_OUTPUT;
- reg |= (1 << pin->gp_pin);
- } else {
- pin->gp_flags |= GPIO_PIN_INPUT;
- reg &= ~(1 << pin->gp_pin);
- }
- }
-
- WRITE4(sc, GPIO_SWPORTA_DDR, reg);
- GPIO_UNLOCK(sc);
-}
-
-
-static int
-socfpga_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
-{
- struct socfpga_gpio_softc *sc;
- int i;
-
- sc = device_get_softc(dev);
- for (i = 0; i < sc->gpio_npins; i++) {
- if (sc->gpio_pins[i].gp_pin == pin)
- break;
- }
-
- if (i >= sc->gpio_npins)
- return (EINVAL);
-
- socfpga_gpio_pin_configure(sc, &sc->gpio_pins[i], flags);
-
- return (0);
-}
-
-static int
-socfpga_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value)
-{
- struct socfpga_gpio_softc *sc;
- int reg;
- int i;
-
- sc = device_get_softc(dev);
-
- for (i = 0; i < sc->gpio_npins; i++) {
- if (sc->gpio_pins[i].gp_pin == pin)
- break;
- }
-
- if (i >= sc->gpio_npins)
- return (EINVAL);
-
- GPIO_LOCK(sc);
- reg = READ4(sc, GPIO_SWPORTA_DR);
- if (value)
- reg |= (1 << i);
- else
- reg &= ~(1 << i);
- WRITE4(sc, GPIO_SWPORTA_DR, reg);
- GPIO_UNLOCK(sc);
-
- return (0);
-}
-
-static device_method_t socfpga_gpio_methods[] = {
- DEVMETHOD(device_probe, socfpga_gpio_probe),
- DEVMETHOD(device_attach, socfpga_gpio_attach),
-
- /* GPIO protocol */
- DEVMETHOD(gpio_get_bus, socfpga_gpio_get_bus),
- DEVMETHOD(gpio_pin_max, socfpga_gpio_pin_max),
- DEVMETHOD(gpio_pin_getname, socfpga_gpio_pin_getname),
- DEVMETHOD(gpio_pin_getcaps, socfpga_gpio_pin_getcaps),
- DEVMETHOD(gpio_pin_getflags, socfpga_gpio_pin_getflags),
- DEVMETHOD(gpio_pin_get, socfpga_gpio_pin_get),
- DEVMETHOD(gpio_pin_toggle, socfpga_gpio_pin_toggle),
- DEVMETHOD(gpio_pin_setflags, socfpga_gpio_pin_setflags),
- DEVMETHOD(gpio_pin_set, socfpga_gpio_pin_set),
- { 0, 0 }
-};
-
-static driver_t socfpga_gpio_driver = {
- "gpio",
- socfpga_gpio_methods,
- sizeof(struct socfpga_gpio_softc),
-};
-
-static devclass_t socfpga_gpio_devclass;
-
-DRIVER_MODULE(socfpga_gpio, simplebus, socfpga_gpio_driver,
- socfpga_gpio_devclass, 0, 0);
Property changes on: head/sys/arm/altera/socfpga/socfpga_gpio.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sys/arm/altera/socfpga/files.socfpga
===================================================================
--- head/sys/arm/altera/socfpga/files.socfpga (revision 351816)
+++ head/sys/arm/altera/socfpga/files.socfpga (revision 351817)
@@ -1,21 +1,20 @@
# $FreeBSD$
arm/altera/socfpga/socfpga_common.c standard
arm/altera/socfpga/socfpga_machdep.c standard
arm/altera/socfpga/socfpga_manager.c standard
arm/altera/socfpga/socfpga_rstmgr.c standard
arm/altera/socfpga/socfpga_mp.c optional smp
-arm/altera/socfpga/socfpga_gpio.c optional gpio
dev/mmc/host/dwmmc.c optional dwmmc
dev/mmc/host/dwmmc_altera.c optional dwmmc
# Arria 10
arm/altera/socfpga/socfpga_a10_manager.c standard
# BERI specific
dev/beri/beri_ring.c optional beri_ring
dev/beri/beri_mem.c optional beri_mem
dev/beri/virtio/virtio.c optional beri_vtblk | vtbe
dev/beri/virtio/virtio_block.c optional beri_vtblk
dev/beri/virtio/network/if_vtbe.c optional vtbe
Index: head/sys/dev/gpio/dwgpio/dwgpio.c
===================================================================
--- head/sys/dev/gpio/dwgpio/dwgpio.c (nonexistent)
+++ head/sys/dev/gpio/dwgpio/dwgpio.c (revision 351817)
@@ -0,0 +1,425 @@
+/*-
+ * Copyright (c) 2015, 2019 Ruslan Bukin
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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.
+ */
+
+/*
+ * Synopsys® DesignWare® APB General Purpose Programming I/O
+ * (DW_apb_gpio) peripheral.
+ *
+ * Chapter 22, Cyclone V Device Handbook (CV-5V2 2014.07.22)
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include "gpio_if.h"
+#include "dwgpio_if.h"
+
+#define READ4(_sc, _reg) DWGPIO_READ((_sc)->parent, _reg)
+#define WRITE4(_sc, _reg, _val) DWGPIO_WRITE((_sc)->parent, _reg, _val)
+
+#define GPIO_SWPORT_DR(n) (0x00 + 0xc * (n)) /* Port n Data Register */
+#define GPIO_SWPORT_DDR(n) (0x04 + 0xc * (n)) /* Port n Data Direction */
+#define GPIO_INTEN 0x30 /* Interrupt Enable Register */
+#define GPIO_INTMASK 0x34 /* Interrupt Mask Register */
+#define GPIO_INTTYPE_LEVEL 0x38 /* Interrupt Level Register */
+#define GPIO_INT_POLARITY 0x3C /* Interrupt Polarity Register */
+#define GPIO_INTSTATUS 0x40 /* Interrupt Status Register */
+#define GPIO_RAW_INTSTATUS 0x44 /* Raw Interrupt Status Register */
+#define GPIO_DEBOUNCE 0x48 /* Debounce Enable Register */
+#define GPIO_PORTA_EOI 0x4C /* Clear Interrupt Register */
+#define GPIO_EXT_PORT(n) (0x50 + 0x4 * (n)) /* External Port n */
+#define GPIO_LS_SYNC 0x60 /* Synchronization Level Register */
+#define GPIO_ID_CODE 0x64 /* ID Code Register */
+#define GPIO_VER_ID_CODE 0x6C /* GPIO Version Register */
+#define GPIO_CONFIG_REG2 0x70 /* Configuration Register 2 */
+#define ENCODED_ID_PWIDTH_M 0x1f /* Width of GPIO Port N Mask */
+#define ENCODED_ID_PWIDTH_S(n) (5 * n) /* Width of GPIO Port N Shift */
+#define GPIO_CONFIG_REG1 0x74 /* Configuration Register 1 */
+
+#define NR_GPIO_MAX 32 /* Maximum pins per port */
+
+#define GPIO_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
+#define GPIO_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
+
+#define DEFAULT_CAPS (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)
+
+/*
+ * GPIO interface
+ */
+static device_t dwgpio_get_bus(device_t);
+static int dwgpio_pin_max(device_t, int *);
+static int dwgpio_pin_getcaps(device_t, uint32_t, uint32_t *);
+static int dwgpio_pin_getname(device_t, uint32_t, char *);
+static int dwgpio_pin_getflags(device_t, uint32_t, uint32_t *);
+static int dwgpio_pin_setflags(device_t, uint32_t, uint32_t);
+static int dwgpio_pin_set(device_t, uint32_t, unsigned int);
+static int dwgpio_pin_get(device_t, uint32_t, unsigned int *);
+static int dwgpio_pin_toggle(device_t, uint32_t pin);
+
+struct dwgpio_softc {
+ device_t dev;
+ device_t busdev;
+ device_t parent;
+ struct mtx sc_mtx;
+ int gpio_npins;
+ struct gpio_pin gpio_pins[NR_GPIO_MAX];
+ phandle_t node;
+ int port;
+};
+
+static int
+dwgpio_probe(device_t dev)
+{
+
+ if (!ofw_bus_status_okay(dev))
+ return (ENXIO);
+
+ if (!ofw_bus_is_compatible(dev, "snps,dw-apb-gpio-port"))
+ return (ENXIO);
+
+ device_set_desc(dev, "DesignWare General-Purpose I/O Interface");
+ return (BUS_PROBE_DEFAULT);
+}
+
+static int
+dwgpio_attach(device_t dev)
+{
+ struct dwgpio_softc *sc;
+ int version;
+ int nr_pins;
+ int cfg2;
+ int i;
+
+ sc = device_get_softc(dev);
+ sc->parent = device_get_parent(dev);
+ sc->node = ofw_bus_get_node(dev);
+ sc->dev = dev;
+ mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
+
+ if ((OF_getencprop(sc->node, "reg", &sc->port, sizeof(sc->port))) <= 0)
+ return (ENXIO);
+
+ printf("port %d\n", sc->port);
+
+ version = READ4(sc, GPIO_VER_ID_CODE);
+ if (boothowto & RB_VERBOSE)
+ device_printf(sc->dev, "Version = 0x%08x\n", version);
+
+ /* Grab number of pins from hardware. */
+ cfg2 = READ4(sc, GPIO_CONFIG_REG2);
+ nr_pins = (cfg2 >> ENCODED_ID_PWIDTH_S(sc->port)) & \
+ ENCODED_ID_PWIDTH_M;
+ sc->gpio_npins = nr_pins + 1;
+
+ for (i = 0; i < sc->gpio_npins; i++) {
+ sc->gpio_pins[i].gp_pin = i;
+ sc->gpio_pins[i].gp_caps = DEFAULT_CAPS;
+ sc->gpio_pins[i].gp_flags =
+ (READ4(sc, GPIO_SWPORT_DDR(sc->port)) & (1 << i)) ?
+ GPIO_PIN_OUTPUT: GPIO_PIN_INPUT;
+ snprintf(sc->gpio_pins[i].gp_name, GPIOMAXNAME,
+ "dwgpio%d.%d", device_get_unit(dev), i);
+ }
+ sc->busdev = gpiobus_attach_bus(dev);
+ if (sc->busdev == NULL) {
+ mtx_destroy(&sc->sc_mtx);
+ return (ENXIO);
+ }
+
+ return (0);
+}
+
+static device_t
+dwgpio_get_bus(device_t dev)
+{
+ struct dwgpio_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ return (sc->busdev);
+}
+
+static int
+dwgpio_pin_max(device_t dev, int *maxpin)
+{
+ struct dwgpio_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ *maxpin = sc->gpio_npins - 1;
+
+ return (0);
+}
+
+static int
+dwgpio_pin_getname(device_t dev, uint32_t pin, char *name)
+{
+ struct dwgpio_softc *sc;
+ int i;
+
+ sc = device_get_softc(dev);
+ for (i = 0; i < sc->gpio_npins; i++) {
+ if (sc->gpio_pins[i].gp_pin == pin)
+ break;
+ }
+
+ if (i >= sc->gpio_npins)
+ return (EINVAL);
+
+ GPIO_LOCK(sc);
+ memcpy(name, sc->gpio_pins[i].gp_name, GPIOMAXNAME);
+ GPIO_UNLOCK(sc);
+
+ return (0);
+}
+
+static int
+dwgpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps)
+{
+ struct dwgpio_softc *sc;
+ int i;
+
+ sc = device_get_softc(dev);
+ for (i = 0; i < sc->gpio_npins; i++) {
+ if (sc->gpio_pins[i].gp_pin == pin)
+ break;
+ }
+
+ if (i >= sc->gpio_npins)
+ return (EINVAL);
+
+ GPIO_LOCK(sc);
+ *caps = sc->gpio_pins[i].gp_caps;
+ GPIO_UNLOCK(sc);
+
+ return (0);
+}
+
+static int
+dwgpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags)
+{
+ struct dwgpio_softc *sc;
+ int i;
+
+ sc = device_get_softc(dev);
+ for (i = 0; i < sc->gpio_npins; i++) {
+ if (sc->gpio_pins[i].gp_pin == pin)
+ break;
+ }
+
+ if (i >= sc->gpio_npins)
+ return (EINVAL);
+
+ GPIO_LOCK(sc);
+ *flags = sc->gpio_pins[i].gp_flags;
+ GPIO_UNLOCK(sc);
+
+ return (0);
+}
+
+static int
+dwgpio_pin_get(device_t dev, uint32_t pin, unsigned int *val)
+{
+ struct dwgpio_softc *sc;
+ int i;
+
+ sc = device_get_softc(dev);
+ for (i = 0; i < sc->gpio_npins; i++) {
+ if (sc->gpio_pins[i].gp_pin == pin)
+ break;
+ }
+
+ if (i >= sc->gpio_npins)
+ return (EINVAL);
+
+ GPIO_LOCK(sc);
+ *val = (READ4(sc, GPIO_EXT_PORT(sc->port)) & (1 << i)) ? 1 : 0;
+ GPIO_UNLOCK(sc);
+
+ return (0);
+}
+
+static int
+dwgpio_pin_toggle(device_t dev, uint32_t pin)
+{
+ struct dwgpio_softc *sc;
+ int reg;
+ int i;
+
+ sc = device_get_softc(dev);
+ for (i = 0; i < sc->gpio_npins; i++) {
+ if (sc->gpio_pins[i].gp_pin == pin)
+ break;
+ }
+
+ if (i >= sc->gpio_npins)
+ return (EINVAL);
+
+ GPIO_LOCK(sc);
+ reg = READ4(sc, GPIO_SWPORT_DR(sc->port));
+ if (reg & (1 << i))
+ reg &= ~(1 << i);
+ else
+ reg |= (1 << i);
+ WRITE4(sc, GPIO_SWPORT_DR(sc->port), reg);
+ GPIO_UNLOCK(sc);
+
+ return (0);
+}
+
+
+static void
+dwgpio_pin_configure(struct dwgpio_softc *sc,
+ struct gpio_pin *pin, unsigned int flags)
+{
+ int reg;
+
+ GPIO_LOCK(sc);
+
+ /*
+ * Manage input/output
+ */
+
+ reg = READ4(sc, GPIO_SWPORT_DDR(sc->port));
+ if (flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
+ pin->gp_flags &= ~(GPIO_PIN_INPUT|GPIO_PIN_OUTPUT);
+ if (flags & GPIO_PIN_OUTPUT) {
+ pin->gp_flags |= GPIO_PIN_OUTPUT;
+ reg |= (1 << pin->gp_pin);
+ } else {
+ pin->gp_flags |= GPIO_PIN_INPUT;
+ reg &= ~(1 << pin->gp_pin);
+ }
+ }
+
+ WRITE4(sc, GPIO_SWPORT_DDR(sc->port), reg);
+ GPIO_UNLOCK(sc);
+}
+
+
+static int
+dwgpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
+{
+ struct dwgpio_softc *sc;
+ int i;
+
+ sc = device_get_softc(dev);
+ for (i = 0; i < sc->gpio_npins; i++) {
+ if (sc->gpio_pins[i].gp_pin == pin)
+ break;
+ }
+
+ if (i >= sc->gpio_npins)
+ return (EINVAL);
+
+ dwgpio_pin_configure(sc, &sc->gpio_pins[i], flags);
+
+ return (0);
+}
+
+static int
+dwgpio_pin_set(device_t dev, uint32_t pin, unsigned int value)
+{
+ struct dwgpio_softc *sc;
+ int reg;
+ int i;
+
+ sc = device_get_softc(dev);
+
+ for (i = 0; i < sc->gpio_npins; i++) {
+ if (sc->gpio_pins[i].gp_pin == pin)
+ break;
+ }
+
+ if (i >= sc->gpio_npins)
+ return (EINVAL);
+
+ GPIO_LOCK(sc);
+ reg = READ4(sc, GPIO_SWPORT_DR(sc->port));
+ if (value)
+ reg |= (1 << i);
+ else
+ reg &= ~(1 << i);
+ WRITE4(sc, GPIO_SWPORT_DR(sc->port), reg);
+ GPIO_UNLOCK(sc);
+
+ return (0);
+}
+
+static device_method_t dwgpio_methods[] = {
+ DEVMETHOD(device_probe, dwgpio_probe),
+ DEVMETHOD(device_attach, dwgpio_attach),
+
+ /* GPIO protocol */
+ DEVMETHOD(gpio_get_bus, dwgpio_get_bus),
+ DEVMETHOD(gpio_pin_max, dwgpio_pin_max),
+ DEVMETHOD(gpio_pin_getname, dwgpio_pin_getname),
+ DEVMETHOD(gpio_pin_getcaps, dwgpio_pin_getcaps),
+ DEVMETHOD(gpio_pin_getflags, dwgpio_pin_getflags),
+ DEVMETHOD(gpio_pin_get, dwgpio_pin_get),
+ DEVMETHOD(gpio_pin_toggle, dwgpio_pin_toggle),
+ DEVMETHOD(gpio_pin_setflags, dwgpio_pin_setflags),
+ DEVMETHOD(gpio_pin_set, dwgpio_pin_set),
+ { 0, 0 }
+};
+
+static driver_t dwgpio_driver = {
+ "gpio",
+ dwgpio_methods,
+ sizeof(struct dwgpio_softc),
+};
+
+static devclass_t dwgpio_devclass;
+
+DRIVER_MODULE(dwgpio, dwgpiobus, dwgpio_driver,
+ dwgpio_devclass, 0, 0);
Property changes on: head/sys/dev/gpio/dwgpio/dwgpio.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sys/dev/gpio/dwgpio/dwgpio_bus.c
===================================================================
--- head/sys/dev/gpio/dwgpio/dwgpio_bus.c (nonexistent)
+++ head/sys/dev/gpio/dwgpio/dwgpio_bus.c (revision 351817)
@@ -0,0 +1,166 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Ruslan Bukin
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory (Department of Computer Science and
+ * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+ * DARPA SSITH research programme.
+ *
+ * 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
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+#include
+
+#include "dwgpio_if.h"
+
+struct dwgpiobus_softc {
+ struct simplebus_softc simplebus_sc;
+ device_t dev;
+ struct resource *res[1];
+};
+
+static struct resource_spec dwgpio_spec[] = {
+ { SYS_RES_MEMORY, 0, RF_ACTIVE },
+ { -1, 0 }
+};
+
+static int
+dwgpiobus_probe(device_t dev)
+{
+
+ if (!ofw_bus_is_compatible(dev, "snps,dw-apb-gpio"))
+ return (ENXIO);
+
+ if (!ofw_bus_status_okay(dev))
+ return (ENXIO);
+
+ device_set_desc(dev, "Synopsys® DesignWare® APB GPIO BUS");
+
+ return (BUS_PROBE_DEFAULT);
+}
+
+static int
+dwgpiobus_attach(device_t dev)
+{
+ struct dwgpiobus_softc *sc;
+ phandle_t node;
+
+ sc = device_get_softc(dev);
+ sc->dev = dev;
+
+ node = ofw_bus_get_node(dev);
+ if (node == -1)
+ return (ENXIO);
+
+ if (bus_alloc_resources(dev, dwgpio_spec, sc->res)) {
+ device_printf(dev, "Could not allocate resources.\n");
+ return (ENXIO);
+ }
+
+ simplebus_init(dev, node);
+
+ /*
+ * Allow devices to identify.
+ */
+ bus_generic_probe(dev);
+
+ /*
+ * Now walk the OFW tree and attach top-level devices.
+ */
+ for (node = OF_child(node); node > 0; node = OF_peer(node))
+ simplebus_add_device(dev, node, 0, NULL, -1, NULL);
+
+ return (bus_generic_attach(dev));
+}
+
+static int
+dwgpiobus_detach(device_t dev)
+{
+ struct dwgpiobus_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ bus_release_resources(dev, dwgpio_spec, sc->res);
+
+ return (0);
+}
+
+static int
+dwgpiobus_write(device_t dev, bus_size_t offset, int val)
+{
+ struct dwgpiobus_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ bus_write_4(sc->res[0], offset, val);
+
+ return (0);
+};
+
+static int
+dwgpiobus_read(device_t dev, bus_size_t offset)
+{
+ struct dwgpiobus_softc *sc;
+ int val;
+
+ sc = device_get_softc(dev);
+
+ val = bus_read_4(sc->res[0], offset);
+
+ return (val);
+};
+
+static device_method_t dwgpiobus_methods[] = {
+ DEVMETHOD(device_probe, dwgpiobus_probe),
+ DEVMETHOD(device_attach, dwgpiobus_attach),
+ DEVMETHOD(device_detach, dwgpiobus_detach),
+
+ DEVMETHOD(dwgpio_write, dwgpiobus_write),
+ DEVMETHOD(dwgpio_read, dwgpiobus_read),
+
+ DEVMETHOD_END
+};
+
+DEFINE_CLASS_1(dwgpiobus, dwgpiobus_driver, dwgpiobus_methods,
+ sizeof(struct dwgpiobus_softc), simplebus_driver);
+
+static devclass_t dwgpiobus_devclass;
+
+EARLY_DRIVER_MODULE(dwgpiobus, simplebus, dwgpiobus_driver, dwgpiobus_devclass,
+ 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+MODULE_VERSION(dwgpiobus, 1);
Property changes on: head/sys/dev/gpio/dwgpio/dwgpio_bus.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sys/dev/gpio/dwgpio/dwgpio_if.m
===================================================================
--- head/sys/dev/gpio/dwgpio/dwgpio_if.m (nonexistent)
+++ head/sys/dev/gpio/dwgpio/dwgpio_if.m (revision 351817)
@@ -0,0 +1,52 @@
+#-
+# Copyright (c) 2019 Ruslan Bukin
+#
+# This software was developed by SRI International and the University of
+# Cambridge Computer Laboratory (Department of Computer Science and
+# Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+# DARPA SSITH research programme.
+#
+# 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.
+#
+# $FreeBSD$
+#
+
+#include
+
+INTERFACE dwgpio;
+
+#
+# GPIO write
+#
+METHOD int write {
+ device_t dev;
+ bus_size_t offset;
+ int val;
+};
+
+#
+# GPIO read
+#
+METHOD int read {
+ device_t dev;
+ bus_size_t offset;
+};
Property changes on: head/sys/dev/gpio/dwgpio/dwgpio_if.m
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property