summaryrefslogtreecommitdiffstats
path: root/sys/mips/rt305x/rt305x_dotg.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/mips/rt305x/rt305x_dotg.c')
-rw-r--r--sys/mips/rt305x/rt305x_dotg.c122
1 files changed, 64 insertions, 58 deletions
diff --git a/sys/mips/rt305x/rt305x_dotg.c b/sys/mips/rt305x/rt305x_dotg.c
index 1159158..607b215 100644
--- a/sys/mips/rt305x/rt305x_dotg.c
+++ b/sys/mips/rt305x/rt305x_dotg.c
@@ -2,6 +2,7 @@
__FBSDID("$FreeBSD$");
/*-
+ * Copyright (c) 2015 Stanislav Galabov. All rights reserved.
* Copyright (c) 2010,2011 Aleksandr Rybalko. All rights reserved.
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
*
@@ -58,7 +59,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_controller.h>
#include <dev/usb/usb_bus.h>
-#include <dev/usb/controller/dotg.h>
+#include <dev/usb/controller/dwc_otg.h>
#include <mips/rt305x/rt305xreg.h>
#include <mips/rt305x/rt305x_sysctlvar.h>
@@ -68,10 +69,6 @@ static device_probe_t dotg_obio_probe;
static device_attach_t dotg_obio_attach;
static device_detach_t dotg_obio_detach;
-struct dotg_obio_softc {
- struct dotg_softc sc_dci; /* must be first */
-};
-
static int
dotg_obio_probe(device_t dev)
{
@@ -82,61 +79,63 @@ dotg_obio_probe(device_t dev)
static int
dotg_obio_attach(device_t dev)
{
- struct dotg_obio_softc *sc = device_get_softc(dev);
- int err;
+ struct dwc_otg_softc *sc = device_get_softc(dev);
+ uint32_t tmp;
+ int err, rid;
/* setup controller interface softc */
/* initialise some bus fields */
- sc->sc_dci.sc_dev = dev;
- sc->sc_dci.sc_bus.parent = dev;
- sc->sc_dci.sc_bus.devices = sc->sc_dci.sc_devices;
- sc->sc_dci.sc_bus.devices_max = DOTG_MAX_DEVICES;
- sc->sc_dci.sc_bus.dma_bits = 32;
+ sc->sc_mode = DWC_MODE_HOST;
+ sc->sc_bus.parent = dev;
+ sc->sc_bus.devices = sc->sc_devices;
+ sc->sc_bus.devices_max = DWC_OTG_MAX_DEVICES;
+ sc->sc_bus.dma_bits = 32;
/* get all DMA memory */
- if (usb_bus_mem_alloc_all(&sc->sc_dci.sc_bus,
+ if (usb_bus_mem_alloc_all(&sc->sc_bus,
USB_GET_DMA_TAG(dev), NULL)) {
printf("No mem\n");
return (ENOMEM);
}
- sc->sc_dci.sc_mem_rid = 0;
- sc->sc_dci.sc_mem_res =
- bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_dci.sc_irq_rid,
- RF_ACTIVE);
- if (!(sc->sc_dci.sc_mem_res)) {
+ rid = 0;
+ sc->sc_io_res =
+ bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+ if (!(sc->sc_io_res)) {
printf("Can`t alloc MEM\n");
goto error;
}
- sc->sc_dci.sc_bst = rman_get_bustag(sc->sc_dci.sc_mem_res);
- sc->sc_dci.sc_bsh = rman_get_bushandle(sc->sc_dci.sc_mem_res);
-
- sc->sc_dci.sc_irq_rid = 0;
- sc->sc_dci.sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
- &sc->sc_dci.sc_irq_rid, RF_SHAREABLE| RF_ACTIVE);
- if (!(sc->sc_dci.sc_irq_res)) {
+ sc->sc_io_tag = rman_get_bustag(sc->sc_io_res);
+ sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
+ sc->sc_io_size = rman_get_size(sc->sc_io_res);
+
+ rid = 0;
+ sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &rid, RF_ACTIVE);
+ if (!(sc->sc_irq_res)) {
printf("Can`t alloc IRQ\n");
goto error;
}
- sc->sc_dci.sc_bus.bdev = device_add_child(dev, "usbus", -1);
- if (!(sc->sc_dci.sc_bus.bdev)) {
+ sc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
+ if (!(sc->sc_bus.bdev)) {
printf("Can`t add usbus\n");
goto error;
}
- device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus);
+ device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
#if (__FreeBSD_version >= 700031)
- err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res,
- INTR_TYPE_BIO | INTR_MPSAFE, NULL, (driver_intr_t *)dotg_interrupt,
- sc, &sc->sc_dci.sc_intr_hdl);
+ err = bus_setup_intr(dev, sc->sc_irq_res,
+ INTR_TYPE_TTY | INTR_MPSAFE, dwc_otg_filter_interrupt,
+ dwc_otg_interrupt, sc, &sc->sc_intr_hdl);
#else
- err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res,
- INTR_TYPE_BIO | INTR_MPSAFE, (driver_intr_t *)dotg_interrupt,
- sc, &sc->sc_dci.sc_intr_hdl);
+ #error error
+ err = bus_setup_intr(dev, sc->sc_irq_res,
+ INTR_TYPE_BIO | INTR_MPSAFE,(driver_intr_t*)dwc_otg_interrupt,
+ sc, &sc->sc_intr_hdl);
#endif
if (err) {
- sc->sc_dci.sc_intr_hdl = NULL;
+ sc->sc_intr_hdl = NULL;
printf("Can`t set IRQ handle\n");
goto error;
}
@@ -144,14 +143,21 @@ dotg_obio_attach(device_t dev)
/* Run clock for OTG core */
rt305x_sysctl_set(SYSCTL_CLKCFG1, rt305x_sysctl_get(SYSCTL_CLKCFG1) |
SYSCTL_CLKCFG1_OTG_CLK_EN);
- rt305x_sysctl_set(SYSCTL_RSTCTRL, SYSCTL_RSTCTRL_OTG);
+ tmp = rt305x_sysctl_get(SYSCTL_RSTCTRL);
+ rt305x_sysctl_set(SYSCTL_RSTCTRL, tmp | SYSCTL_RSTCTRL_OTG);
DELAY(100);
-
- err = dotg_init(&sc->sc_dci);
+ /*
+ * Docs say that RSTCTRL bits for RT305x are W1C, so there should
+ * be no need for the below, but who really knows?
+ */
+// rt305x_sysctl_set(SYSCTL_RSTCTRL, tmp & ~SYSCTL_RSTCTRL_OTG);
+// DELAY(100);
+
+ err = dwc_otg_init(sc);
if (err) printf("dotg_init fail\n");
if (!err) {
- err = device_probe_and_attach(sc->sc_dci.sc_bus.bdev);
- if (err) printf("device_probe_and_attach fail\n");
+ err = device_probe_and_attach(sc->sc_bus.bdev);
+ if (err) printf("device_probe_and_attach fail %d\n", err);
}
if (err) {
goto error;
@@ -166,44 +172,44 @@ error:
static int
dotg_obio_detach(device_t dev)
{
- struct dotg_obio_softc *sc = device_get_softc(dev);
+ struct dwc_otg_softc *sc = device_get_softc(dev);
device_t bdev;
int err;
- if (sc->sc_dci.sc_bus.bdev) {
- bdev = sc->sc_dci.sc_bus.bdev;
+ if (sc->sc_bus.bdev) {
+ bdev = sc->sc_bus.bdev;
device_detach(bdev);
device_delete_child(dev, bdev);
}
/* during module unload there are lots of children leftover */
device_delete_children(dev);
- if (sc->sc_dci.sc_irq_res && sc->sc_dci.sc_intr_hdl) {
+ if (sc->sc_irq_res && sc->sc_intr_hdl) {
/*
* only call dotg_obio_uninit() after dotg_obio_init()
*/
- dotg_uninit(&sc->sc_dci);
+ dwc_otg_uninit(sc);
/* Stop OTG clock */
rt305x_sysctl_set(SYSCTL_CLKCFG1,
rt305x_sysctl_get(SYSCTL_CLKCFG1) &
~SYSCTL_CLKCFG1_OTG_CLK_EN);
- err = bus_teardown_intr(dev, sc->sc_dci.sc_irq_res,
- sc->sc_dci.sc_intr_hdl);
- sc->sc_dci.sc_intr_hdl = NULL;
+ err = bus_teardown_intr(dev, sc->sc_irq_res,
+ sc->sc_intr_hdl);
+ sc->sc_intr_hdl = NULL;
}
- if (sc->sc_dci.sc_irq_res) {
+ if (sc->sc_irq_res) {
bus_release_resource(dev, SYS_RES_IRQ, 0,
- sc->sc_dci.sc_irq_res);
- sc->sc_dci.sc_irq_res = NULL;
+ sc->sc_irq_res);
+ sc->sc_irq_res = NULL;
}
- if (sc->sc_dci.sc_mem_res) {
+ if (sc->sc_io_res) {
bus_release_resource(dev, SYS_RES_MEMORY, 0,
- sc->sc_dci.sc_mem_res);
- sc->sc_dci.sc_mem_res = NULL;
+ sc->sc_io_res);
+ sc->sc_io_res = NULL;
}
- usb_bus_mem_free_all(&sc->sc_dci.sc_bus, NULL);
+ usb_bus_mem_free_all(&sc->sc_bus, NULL);
return (0);
}
@@ -221,11 +227,11 @@ static device_method_t dotg_obio_methods[] = {
};
static driver_t dotg_obio_driver = {
- .name = "dotg",
+ .name = "dwcotg",
.methods = dotg_obio_methods,
- .size = sizeof(struct dotg_obio_softc),
+ .size = sizeof(struct dwc_otg_softc),
};
static devclass_t dotg_obio_devclass;
-DRIVER_MODULE(dotg, obio, dotg_obio_driver, dotg_obio_devclass, 0, 0);
+DRIVER_MODULE(dwcotg, obio, dotg_obio_driver, dotg_obio_devclass, 0, 0);
OpenPOWER on IntegriCloud