 @@ -24,27 +24,27 @@
  * 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.
  */
 #define USBH_PRIVATE
 #include "locators.h"
 #include "ohci.h"
 #include "ehci.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.7 2013/09/07 19:48:57 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.8 2013/09/07 22:51:41 matt Exp $");
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <arm/allwinner/awin_reg.h>
 #include <arm/allwinner/awin_var.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 @@ -79,34 +79,26 @@ struct awinusb_softc {
 struct awinusb_attach_args {
 	const char *usbaa_name;
 	bus_dma_tag_t usbaa_dmat;
 	bus_space_tag_t usbaa_bst;
 	bus_space_handle_t usbaa_bsh;
 	bus_space_handle_t usbaa_ccm_bsh;
 	bus_size_t usbaa_size;
 	int usbaa_port;
 };
 #if NOHCI > 0
 static const int awinusb_ohci_irqs[2] = { AWIN_IRQ_USB3, AWIN_IRQ_USB4 };
 static const uint32_t awinusb_ohci_ahb_gating[2] = {
 	AWIN_AHB_GATING0_USB_OHCI0, AWIN_AHB_GATING0_USB_OHCI1,
 };
 static const uint32_t awinusb_ohci_usb_clk_set[2] = {
 	AWIN_USB_CLK_OHCI0_ENABLE|AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY1_ENABLE,
 	AWIN_USB_CLK_OHCI1_ENABLE|AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY2_ENABLE,
 };
 #ifdef OHCI_DEBUG
 #define OHCI_DPRINTF(x)	if (ohcidebug) printf x
 extern int ohcidebug;
 #else
 #define OHCI_DPRINTF(x)
 #endif
 static int ohci_awinusb_match(device_t, cfdata_t, void *);
 static void ohci_awinusb_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(ohci_awinusb, sizeof(struct ohci_softc),
 	ohci_awinusb_match, ohci_awinusb_attach, NULL, NULL);
 @@ -121,32 +113,26 @@ ohci_awinusb_match(device_t parent, cfda
 	return 1;
+}
 static void
 ohci_awinusb_attach(device_t parent, device_t self, void *aux)
+{
 	struct awinusb_softc * const usbsc = device_private(parent);
 	struct ohci_softc * const sc = device_private(self);
 	struct awinusb_attach_args * const usbaa = aux;
 	sc->sc_dev = self;
 	awin_reg_set_clear(usbaa->usbaa_bst, usbaa->usbaa_ccm_bsh,
 	    AWIN_AHB_GATING0_REG, awinusb_ohci_ahb_gating[usbaa->usbaa_port],
 );
 	awin_reg_set_clear(usbaa->usbaa_bst, usbaa->usbaa_ccm_bsh,
 	    AWIN_USB_CLK_REG, awinusb_ohci_usb_clk_set[usbaa->usbaa_port], 0);
 	sc->iot = usbaa->usbaa_bst;
 	sc->ioh = usbaa->usbaa_bsh;
 	sc->sc_size = usbaa->usbaa_size;
 	sc->sc_bus.dmatag = usbaa->usbaa_dmat;
 	sc->sc_bus.hci_private = sc;
 	//sc->sc_id_vendor = PCI_VENDOR_ALLWINNER;
 	strlcpy(sc->sc_vendor, "Allwinner", sizeof(sc->sc_vendor));
 	aprint_naive(": OHCI USB controller\n");
 	aprint_normal(": OHCI USB controller\n");
 	int error = ohci_init(sc);
 @@ -171,57 +157,50 @@ ohci_awinusb_attach(device_t parent, dev
 #if NEHCI > 0
 #ifdef EHCI_DEBUG
 #define EHCI_DPRINTF(x)	if (ehcidebug) printf x
 extern int ehcidebug;
 #else
 #define EHCI_DPRINTF(x)
 #endif
 static int ehci_awinusb_match(device_t, cfdata_t, void *);
 static void ehci_awinusb_attach(device_t, device_t, void *);
 static const int awinusb_ehci_irqs[2] = { AWIN_IRQ_USB1, AWIN_IRQ_USB2 };
 static const uint32_t awinusb_ehci_ahb_gating[2] = {
 	AWIN_AHB_GATING0_USB_EHCI0, AWIN_AHB_GATING0_USB_EHCI1,
 };
 CFATTACH_DECL_NEW(ehci_awinusb, sizeof(struct ehci_softc),
 	ehci_awinusb_match, ehci_awinusb_attach, NULL, NULL);
 static int
 ehci_awinusb_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct awinusb_attach_args * const usbaa = aux;
 	if (strcmp(cf->cf_name, usbaa->usbaa_name))
 		return 0;
 	return 1;
+}
 static void
 ehci_awinusb_attach(device_t parent, device_t self, void *aux)
+{
 	struct awinusb_softc * const usbsc = device_private(parent);
 	struct ehci_softc * const sc = device_private(self);
 	struct awinusb_attach_args * const usbaa = aux;
 	sc->sc_dev = self;
 	awin_reg_set_clear(usbaa->usbaa_bst, usbaa->usbaa_ccm_bsh,
 	    AWIN_AHB_GATING0_REG, awinusb_ehci_ahb_gating[usbaa->usbaa_port],
 );
 	sc->iot = usbaa->usbaa_bst;
 	sc->ioh = usbaa->usbaa_bsh;
 	sc->sc_size = usbaa->usbaa_size;
 	sc->sc_bus.dmatag = usbaa->usbaa_dmat;
 	sc->sc_bus.hci_private = sc;
 	sc->sc_bus.usbrev = USBREV_2_0;
 	sc->sc_ncomp = 0;
 	if (usbsc->usbsc_ohci_dev != NULL) {
 		sc->sc_comps[sc->sc_ncomp++] = usbsc->usbsc_ohci_dev;
+	}
 	//sc->sc_id_vendor = PCI_VENDOR_ALLWINNER;
 	strlcpy(sc->sc_vendor, "Allwinner", sizeof(sc->sc_vendor));
 @@ -288,26 +267,46 @@ awin_usb_phy_write(struct awinusb_softc
 static int awinusb_match(device_t, cfdata_t, void *);
 static void awinusb_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(awin_usb, sizeof(struct awinusb_softc),
 	awinusb_match, awinusb_attach, NULL, NULL);
 static int awinusb_ports;
 static const char awinusb_drvpin_names[2][8] = { "usb1drv", "usb2drv" };
 static const bus_size_t awinusb_dram_hpcr_regs[2] = {
 	AWIN_DRAM_HPCR_USB1_REG,
 	AWIN_DRAM_HPCR_USB2_REG,
 };
 static const uint32_t awinusb_ahb_gating[2] = {
 #if NOHCI > 0
 	AWIN_AHB_GATING0_USB_OHCI0 |
 #endif
 	AWIN_AHB_GATING0_USB_EHCI0,
 #if NOHCI > 0
 	AWIN_AHB_GATING0_USB_OHCI1 |
 #endif
 	AWIN_AHB_GATING0_USB_EHCI1,
 };
 static const uint32_t awinusb_usb_clk_set[2] = {
 #if NOHCI > 0
 	AWIN_USB_CLK_OHCI0_ENABLE |
 #endif
 	AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY1_ENABLE,
 #if NOHCI > 0
 	AWIN_USB_CLK_OHCI1_ENABLE |
 #endif
 	AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY2_ENABLE,
 };
 int
 awinusb_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct awinio_attach_args * const aio = aux;
 	const struct awin_locators * const loc = &aio->aio_loc;
 	KASSERT(loc->loc_port != AWINIOCF_PORT_DEFAULT);
 	KASSERT(!strcmp(cf->cf_name, loc->loc_name));
 	KASSERT(cf->cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT
 	    || cf->cf_loc[AWINIOCF_PORT] == loc->loc_port);
 	KASSERT((awinusb_ports & __BIT(loc->loc_port)) == 0);
 @@ -334,37 +333,44 @@ awinusb_attach(device_t parent, device_t
 	    loc->loc_offset + AWIN_OHCI_OFFSET, AWIN_OHCI_SIZE,
 	    &usbsc->usbsc_ohci_bsh);
 	bus_space_subregion(usbsc->usbsc_bst, aio->aio_core_bsh,
 	    AWIN_USB0_OFFSET + AWIN_USB0_PHY_CSR_REG, 4,
 	    &usbsc->usbsc_usb0_phy_csr_bsh);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	/*
 	 * Access to the USB phy is off USB0 so make sure it's on.
 	*/
 	awin_reg_set_clear(usbsc->usbsc_bst, aio->aio_ccm_bsh,
-	    AWIN_AHB_GATING0_REG, AWIN_AHB_GATING0_USB0, 0);
+	    AWIN_AHB_GATING0_REG,
 	    AWIN_AHB_GATING0_USB0 | awinusb_ahb_gating[loc->loc_port], 0);
 	/*
 	 * Enable the USB phy for this port.
 	 */
 	awin_reg_set_clear(usbsc->usbsc_bst, aio->aio_ccm_bsh,
 	    AWIN_USB_CLK_REG, awinusb_usb_clk_set[loc->loc_port], 0);
 	/*
 	 * Allow USB DMA engine access to the DRAM.
 	 */
 	awin_reg_set_clear(usbsc->usbsc_bst, aio->aio_core_bsh,
 	    loc->loc_offset + AWIN_USB_PMU_IRQ_REG,
 	    AWIN_USB_PMU_IRQ_AHB_INCR8 | AWIN_USB_PMU_IRQ_AHB_INCR4
 	       | AWIN_USB_PMU_IRQ_AHB_INCRX | AWIN_USB_PMU_IRQ_ULPI_BYPASS,
 );
 	/*
 	 * Allow USB DMA engine access to the DRAM.
 	 */
 	awin_reg_set_clear(usbsc->usbsc_bst, aio->aio_core_bsh,
 	    AWIN_DRAM_OFFSET + awinusb_dram_hpcr_regs[loc->loc_port],
 	    AWIN_DRAM_HPCR_ACCESS_EN, 0);
 	/* initialize the USB phy */
 	awin_usb_phy_write(usbsc, 0x20, 0x14, 5);
 	awin_usb_phy_write(usbsc, 0x2a, 0x03, 2);
 	/*
 	 * Now get the GPIO that enables the power to the port and
 	 * turn it on.
 	 */
 	if (awin_gpio_pin_reserve(awinusb_drvpin_names[loc->loc_port],