d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix USB drivers for KB920X target.

Browse Source 
Add missing clock settings.
VBUS GPIO IRQ is still missing (TODO).
This commit is contained in:
Hans Petter Selasky 2012-08-21 20:10:59 +00:00
parent 94d6bc8895
commit b7d049b789
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/dev/usb/controller/at91dci_atmelarm.c
View File

@ -80,6 +80,7 @@ static device_detach_t at91_udp_detach;
struct at91_udp_softc {
struct at91dci_softc sc_dci; /* must be first */
struct at91_pmc_clock *sc_mclk;
struct at91_pmc_clock *sc_iclk;
struct at91_pmc_clock *sc_fclk;
struct resource *sc_vbus_irq_res;
@ -107,6 +108,7 @@ at91_udp_clocks_on(void *arg)
{
struct at91_udp_softc *sc = arg;
at91_pmc_clock_enable(sc->sc_mclk);
at91_pmc_clock_enable(sc->sc_iclk);
at91_pmc_clock_enable(sc->sc_fclk);
}
@ -118,6 +120,7 @@ at91_udp_clocks_off(void *arg)
at91_pmc_clock_disable(sc->sc_fclk);
at91_pmc_clock_disable(sc->sc_iclk);
at91_pmc_clock_disable(sc->sc_mclk);
}
static void
@ -185,6 +188,7 @@ at91_udp_attach(device_t dev)
/* wait 10ms for pulldown to stabilise */
usb_pause_mtx(NULL, hz / 100);
sc->sc_mclk = at91_pmc_clock_ref("mck");
sc->sc_iclk = at91_pmc_clock_ref("udc_clk");
sc->sc_fclk = at91_pmc_clock_ref("udpck");
@ -209,8 +213,9 @@ at91_udp_attach(device_t dev)
rid = 1;
sc->sc_vbus_irq_res =
bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
if (!(sc->sc_vbus_irq_res)) {
goto error;
if (sc->sc_vbus_irq_res == NULL) {
at91_pio_gpio_set_interrupt(VBUS_BASE, VBUS_MASK, 0);
device_printf(dev, "No VBUS IRQ!");
}
sc->sc_dci.sc_bus.bdev = device_add_child(dev, "usbus", -1);
if (!(sc->sc_dci.sc_bus.bdev)) {
@ -230,11 +235,19 @@ at91_udp_attach(device_t dev)
goto error;
}
#if (__FreeBSD_version >= 700031)
err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
NULL, (driver_intr_t *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl);
if (sc->sc_vbus_irq_res != NULL) {
err = bus_setup_intr(dev, sc->sc_vbus_irq_res,
INTR_TYPE_BIO | INTR_MPSAFE,
NULL, (driver_intr_t *)at91_vbus_poll, sc,
&sc->sc_vbus_intr_hdl);
}
#else
err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
(driver_intr_t *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl);
if (sc->sc_vbus_irq_res != NULL) {
err = bus_setup_intr(dev, sc->sc_vbus_irq_res,
INTR_TYPE_BIO | INTR_MPSAFE,
(driver_intr_t *)at91_vbus_poll, sc,
&sc->sc_vbus_intr_hdl);
}
#endif
if (err) {
sc->sc_vbus_intr_hdl = NULL;
@ -317,8 +330,10 @@ at91_udp_detach(device_t dev)
/* disable clocks */
at91_pmc_clock_disable(sc->sc_iclk);
at91_pmc_clock_disable(sc->sc_fclk);
at91_pmc_clock_disable(sc->sc_mclk);
at91_pmc_clock_deref(sc->sc_fclk);
at91_pmc_clock_deref(sc->sc_iclk);
at91_pmc_clock_deref(sc->sc_mclk);
return (0);
}

5
sys/dev/usb/controller/ohci_atmelarm.c
View File

@ -69,6 +69,7 @@ static device_detach_t ohci_atmelarm_detach;
struct at91_ohci_softc {
struct ohci_softc sc_ohci; /* must be first */
struct at91_pmc_clock *mclk;
struct at91_pmc_clock *iclk;
struct at91_pmc_clock *fclk;
};
@ -98,6 +99,7 @@ ohci_atmelarm_attach(device_t dev)
USB_GET_DMA_TAG(dev), &ohci_iterate_hw_softc)) {
return (ENOMEM);
}
sc->mclk = at91_pmc_clock_ref("mck");
sc->iclk = at91_pmc_clock_ref("ohci_clk");
sc->fclk = at91_pmc_clock_ref("uhpck");
@ -143,6 +145,7 @@ ohci_atmelarm_attach(device_t dev)
/*
* turn on the clocks from the AT91's point of view. Keep the unit in reset.
*/
at91_pmc_clock_enable(sc->mclk);
at91_pmc_clock_enable(sc->iclk);
at91_pmc_clock_enable(sc->fclk);
bus_space_write_4(sc->sc_ohci.sc_io_tag, sc->sc_ohci.sc_io_hdl,
@ -191,8 +194,10 @@ ohci_atmelarm_detach(device_t dev)
at91_pmc_clock_disable(sc->fclk);
at91_pmc_clock_disable(sc->iclk);
at91_pmc_clock_disable(sc->mclk);
at91_pmc_clock_deref(sc->fclk);
at91_pmc_clock_deref(sc->iclk);
at91_pmc_clock_deref(sc->mclk);
if (sc->sc_ohci.sc_irq_res && sc->sc_ohci.sc_intr_hdl) {
/*