diff options
author | ganbold <ganbold@FreeBSD.org> | 2013-10-21 09:34:04 +0000 |
---|---|---|
committer | ganbold <ganbold@FreeBSD.org> | 2013-10-21 09:34:04 +0000 |
commit | fc5681aea5cc29acd14c9e3f6f0550bda5c0847a (patch) | |
tree | 89642b42b50ed5f6dc4544c11ab460de36d38d01 /sys/arm/broadcom | |
parent | 6d8fb50c15c114b38ff68bae5663f3a63f0240c5 (diff) | |
download | FreeBSD-src-fc5681aea5cc29acd14c9e3f6f0550bda5c0847a.zip FreeBSD-src-fc5681aea5cc29acd14c9e3f6f0550bda5c0847a.tar.gz |
Move and rename dwc otg driver to more
generic one as it appears to work
for rk3188 SoC based board too.
No objections from: hselasky@
Reviewed by: ray@
Diffstat (limited to 'sys/arm/broadcom')
-rw-r--r-- | sys/arm/broadcom/bcm2835/dwc_otg_brcm.c | 211 | ||||
-rw-r--r-- | sys/arm/broadcom/bcm2835/files.bcm2835 | 2 |
2 files changed, 1 insertions, 212 deletions
diff --git a/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c b/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c deleted file mode 100644 index ac7a18d..0000000 --- a/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c +++ /dev/null @@ -1,211 +0,0 @@ -/*- - * Copyright (c) 2012 Hans Petter Selasky. 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/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/stdint.h> -#include <sys/stddef.h> -#include <sys/param.h> -#include <sys/queue.h> -#include <sys/types.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/bus.h> -#include <sys/module.h> -#include <sys/lock.h> -#include <sys/mutex.h> -#include <sys/condvar.h> -#include <sys/sysctl.h> -#include <sys/sx.h> -#include <sys/unistd.h> -#include <sys/callout.h> -#include <sys/malloc.h> -#include <sys/priv.h> -#include <sys/rman.h> - -#include <dev/fdt/fdt_common.h> -#include <dev/ofw/openfirm.h> -#include <dev/ofw/ofw_bus.h> -#include <dev/ofw/ofw_bus_subr.h> - -#include <dev/usb/usb.h> -#include <dev/usb/usbdi.h> - -#include <dev/usb/usb_core.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_process.h> -#include <dev/usb/usb_util.h> - -#include <dev/usb/usb_controller.h> -#include <dev/usb/usb_bus.h> - -#include <dev/usb/controller/dwc_otg.h> - -static device_probe_t dwc_otg_probe; -static device_attach_t dwc_otg_attach; -static device_detach_t dwc_otg_detach; - -struct dwc_otg_super_softc { - struct dwc_otg_softc sc_otg; /* must be first */ -}; - -static int -dwc_otg_probe(device_t dev) -{ - if (!ofw_bus_is_compatible(dev, "synopsys,designware-hs-otg2")) - return (ENXIO); - - device_set_desc(dev, "DWC OTG 2.0 integrated USB controller"); - - return (0); -} - -static int -dwc_otg_attach(device_t dev) -{ - struct dwc_otg_super_softc *sc = device_get_softc(dev); - int err; - int rid; - - /* initialise some bus fields */ - sc->sc_otg.sc_bus.parent = dev; - sc->sc_otg.sc_bus.devices = sc->sc_otg.sc_devices; - sc->sc_otg.sc_bus.devices_max = DWC_OTG_MAX_DEVICES; - - /* get all DMA memory */ - if (usb_bus_mem_alloc_all(&sc->sc_otg.sc_bus, - USB_GET_DMA_TAG(dev), NULL)) { - return (ENOMEM); - } - rid = 0; - sc->sc_otg.sc_io_res = - bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - - if (!(sc->sc_otg.sc_io_res)) { - err = ENOMEM; - goto error; - } - sc->sc_otg.sc_io_tag = rman_get_bustag(sc->sc_otg.sc_io_res); - sc->sc_otg.sc_io_hdl = rman_get_bushandle(sc->sc_otg.sc_io_res); - sc->sc_otg.sc_io_size = rman_get_size(sc->sc_otg.sc_io_res); - - rid = 0; - sc->sc_otg.sc_irq_res = - bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->sc_otg.sc_irq_res == NULL) - goto error; - - sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1); - if (sc->sc_otg.sc_bus.bdev == NULL) - goto error; - - device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus); - - err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (driver_intr_t *)dwc_otg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); - if (err) { - sc->sc_otg.sc_intr_hdl = NULL; - goto error; - } - err = dwc_otg_init(&sc->sc_otg); - if (err == 0) { - err = device_probe_and_attach(sc->sc_otg.sc_bus.bdev); - } - if (err) - goto error; - - - return (0); - -error: - dwc_otg_detach(dev); - return (ENXIO); -} - -static int -dwc_otg_detach(device_t dev) -{ - struct dwc_otg_super_softc *sc = device_get_softc(dev); - device_t bdev; - int err; - - if (sc->sc_otg.sc_bus.bdev) { - bdev = sc->sc_otg.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_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { - /* - * only call dwc_otg_uninit() after dwc_otg_init() - */ - dwc_otg_uninit(&sc->sc_otg); - - err = bus_teardown_intr(dev, sc->sc_otg.sc_irq_res, - sc->sc_otg.sc_intr_hdl); - sc->sc_otg.sc_intr_hdl = NULL; - } - /* free IRQ channel, if any */ - if (sc->sc_otg.sc_irq_res) { - bus_release_resource(dev, SYS_RES_IRQ, 0, - sc->sc_otg.sc_irq_res); - sc->sc_otg.sc_irq_res = NULL; - } - /* free memory resource, if any */ - if (sc->sc_otg.sc_io_res) { - bus_release_resource(dev, SYS_RES_MEMORY, 0, - sc->sc_otg.sc_io_res); - sc->sc_otg.sc_io_res = NULL; - } - usb_bus_mem_free_all(&sc->sc_otg.sc_bus, NULL); - - return (0); -} - -static device_method_t dwc_otg_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, dwc_otg_probe), - DEVMETHOD(device_attach, dwc_otg_attach), - DEVMETHOD(device_detach, dwc_otg_detach), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - - DEVMETHOD_END -}; - -static driver_t dwc_otg_driver = { - .name = "dwcotg", - .methods = dwc_otg_methods, - .size = sizeof(struct dwc_otg_super_softc), -}; - -static devclass_t dwc_otg_devclass; - -DRIVER_MODULE(dwcotg, simplebus, dwc_otg_driver, dwc_otg_devclass, 0, 0); -MODULE_DEPEND(dwcotg, usb, 1, 1, 1); diff --git a/sys/arm/broadcom/bcm2835/files.bcm2835 b/sys/arm/broadcom/bcm2835/files.bcm2835 index 9c0ff05..10df1a2 100644 --- a/sys/arm/broadcom/bcm2835/files.bcm2835 +++ b/sys/arm/broadcom/bcm2835/files.bcm2835 @@ -11,7 +11,7 @@ arm/broadcom/bcm2835/bcm2835_systimer.c standard arm/broadcom/bcm2835/bcm2835_wdog.c standard arm/broadcom/bcm2835/bus_space.c optional fdt arm/broadcom/bcm2835/common.c optional fdt -arm/broadcom/bcm2835/dwc_otg_brcm.c optional dwcotg +dev/usb/controller/dwc_otg_fdt.c optional dwcotg arm/arm/bus_space_generic.c standard arm/arm/bus_space_asm_generic.S standard |