 @@ -1,14 +1,14 @@
-/*	$NetBSD: ingenic_ehci.c,v 1.3 2015/03/17 09:27:09 macallan Exp $ */
+/*	$NetBSD: ingenic_ehci.c,v 1.4 2016/01/02 16:50:52 macallan Exp $ */
 /*-
  * Copyright (c) 2015 Michael Lorenz
  * 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.
 @@ -17,27 +17,27 @@
  * ``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 FOUNDATION 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>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.3 2015/03/17 09:27:09 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.4 2016/01/02 16:50:52 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <sys/workqueue.h>
 #include <mips/ingenic/ingenic_var.h>
 #include <mips/ingenic/ingenic_regs.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 @@ -64,26 +64,99 @@ extern device_t ingenic_ohci;
 /* ARGSUSED */
 static int
 ingenic_ehci_match(device_t parent, struct cfdata *match, void *aux)
+{
 	struct apbus_attach_args *aa = aux;
 	if (strcmp(aa->aa_name, "ehci") != 0)
 		return 0;
 	return 1;
+}
 static int
 ingenic_ehci_enable(struct ehci_softc *sc)
+{
 	uint32_t reg;
 	/* Togle VBUS pin */
 	gpio_set(5, 15, 0);
 	delay(250000);
 	gpio_set(5, 15, 1);
 	delay(250000);
 	/* Enable OTG, should not be necessary since we use PLL clock */
 	reg = readreg(JZ_USBPCR);
 	reg &= ~(PCR_OTG_DISABLE);
 	writereg(JZ_USBPCR, reg);
 	/* Select CORE as PLL reference */
 	reg = readreg(JZ_USBPCR1);
 	reg |= PCR_REFCLK_CORE;
 	writereg(JZ_USBPCR1, reg);
 	/* Configure OTG PHY clock frequency */
 	reg  = readreg(JZ_USBPCR1);
 	reg &= ~PCR_CLK_M;
 	reg |= PCR_CLK_48;
 	writereg(JZ_USBPCR1, reg);
 	/* Do not force port1 to suspend mode */
 	reg = readreg(JZ_OPCR);
 	reg |= OPCR_SPENDN1;
 	writereg(JZ_OPCR, reg);
 	/* D- pulldown */
 	reg = readreg(JZ_USBPCR1);
 	reg |= PCR_DMPD1;
 	writereg(JZ_USBPCR1, reg);
 	/* D+ pulldown */
 	reg = readreg(JZ_USBPCR1);
 	reg |= PCR_DPPD1;
 	writereg(JZ_USBPCR1, reg);
 	/* 16 bit bus witdth for port 1 (and 0) */
 	reg = readreg(JZ_USBPCR1);
 	reg |= PCR_WORD_I_F1 | PCR_WORD_I_F0;
 	writereg(JZ_USBPCR1, reg);
 	/* Reset USB */
 	reg = readreg(JZ_USBPCR);
 	reg |= PCR_POR;
 	writereg(JZ_USBPCR, reg);
 	delay(1);
 	reg = readreg(JZ_USBPCR);
 	reg &= ~(PCR_POR);
 	writereg(JZ_USBPCR, reg);
 	/* Soft-reset USB */
 	reg = readreg(JZ_SRBC);
 	reg |= (1 << 14);
 	writereg(JZ_SRBC, reg);
 	/* 300ms */
 	delay(300000);
 	reg = readreg(JZ_SRBC);
 	reg &= ~(1 << 14);
 	writereg(JZ_SRBC, reg);
 	/* 300ms */
 	delay(300000);
 	return (0);
+}
 /* ARGSUSED */
 static void
 ingenic_ehci_attach(device_t parent, device_t self, void *aux)
+{
 	struct ehci_softc *sc = device_private(self);
 	struct apbus_attach_args *aa = aux;
 	void *ih;
 	int error, status;
 	uint32_t reg;
 	sc->sc_dev = self;
 	sc->iot = aa->aa_bst;
 @@ -95,61 +168,64 @@ ingenic_ehci_attach(device_t parent, dev
 	if (aa->aa_addr == 0)
 		aa->aa_addr = JZ_EHCI_BASE;
 	error = bus_space_map(aa->aa_bst, aa->aa_addr, 0x1000, 0, &sc->ioh);
 	if (error) {
 		aprint_error_dev(self,
 		    "can't map registers for %s: %d\n", aa->aa_name, error);
 		return;
+	}
 	aprint_naive(": EHCI USB controller\n");
 	aprint_normal(": EHCI USB controller\n");
-	/*
+	ingenic_ehci_enable(sc);
 	 * voodoo from the linux driver:
 	 * select utmi data bus width of controller to 16bit
 	 */
 	reg = bus_space_read_4(sc->iot, sc->ioh,  0xb0);
 	reg |= 1 << 6;
 	bus_space_write_4(sc->iot, sc->ioh,  0xb0, reg);
 	/* Disable EHCI interrupts */
 	bus_space_write_4(sc->iot, sc->ioh, EHCI_USBINTR, 0);
 	ih = evbmips_intr_establish(aa->aa_irq, ehci_intr, sc);
 	if (ih == NULL) {
 		aprint_error_dev(self, "failed to establish interrupt %d\n",
 		     aa->aa_irq);
 		goto fail;
+	}
 #if NOHCI > 0
 	if (ingenic_ohci != NULL) {
 		sc->sc_ncomp = 1;
 		sc->sc_comps[0] = ingenic_ohci;
 	} else
 		sc->sc_ncomp = 0;
 #else
 	sc->sc_ncomp = 0;
 	sc->sc_npcomp = 0;
 #endif
 	sc->sc_id_vendor = USB_VENDOR_INGENIC;
 	strlcpy(sc->sc_vendor, "Ingenic", sizeof(sc->sc_vendor));
 	status = ehci_init(sc);
 	if (status != USBD_NORMAL_COMPLETION) {
 		aprint_error_dev(self, "init failed, error=%d\n", status);
 		goto fail;
+	}
 	/*
 	 * voodoo from the linux driver:
 	 * select utmi data bus width of controller to 16bit
 	 */
 	reg = bus_space_read_4(sc->iot, sc->ioh,  0xb0);
 	reg |= 1 << 6;
 	bus_space_write_4(sc->iot, sc->ioh,  0xb0, reg);
 	/* Attach USB device */
 	sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
 	return;
 fail:
 	if (ih) {
 		evbmips_intr_disestablish(ih);
+	}
 	bus_space_unmap(sc->iot, sc->ioh, 0x1000);
+}