 @@ -1,14 +1,14 @@
-/*	$NetBSD: exynos_usb.c,v 1.10 2014/09/21 15:22:40 reinoud Exp $	*/
+/*	$NetBSD: exynos_usb.c,v 1.11 2014/09/24 20:51:43 reinoud Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Reinoud Zandijk.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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 "locators.h"
 #include "ohci.h"
 #include "ehci.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_usb.c,v 1.10 2014/09/21 15:22:40 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_usb.c,v 1.11 2014/09/24 20:51:43 reinoud Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/intr.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/kmem.h>
 #include <sys/gpio.h>
 #include <dev/usb/usb.h>
 @@ -98,26 +98,36 @@ static struct exynos_gpio_pinset e4_uhos
 	.pinset_group = "ETC6",
 	.pinset_func  = 0,
 	.pinset_mask  = __BIT(6) | __BIT(7),
 };
 #endif
 #ifdef EXYNOS5
 static struct exynos_gpio_pinset e5_uhost_pwr_pinset = {
 	.pinset_group = "ETC6",
 	.pinset_func  = 0,
 	.pinset_mask  = __BIT(5) | __BIT(6),
 };
 static struct exynos_gpio_pinset e5_usb3_bus0_pinset = {
 	.pinset_group = "GPK3",
 	.pinset_func  = 2,
 	.pinset_mask  = __BIT(0) | __BIT(1) | __BIT(3),
 };
 static struct exynos_gpio_pinset e5_usb3_bus1_pinset = {
 	.pinset_group = "GPK2",
 	.pinset_func  = 2,
 	.pinset_mask  = __BIT(4) | __BIT(5) | __BIT(7),
 };
 #endif
 static int exynos_usb_intr(void *arg);
 static void exynos_usb_phy_init(struct exynos_usb_softc *sc);
 static int	exynos_usb_match(device_t, cfdata_t, void *);
 static void	exynos_usb_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(exyo_usb, 0,
     exynos_usb_match, exynos_usb_attach, NULL, NULL);
 @@ -193,40 +203,72 @@ exynos_usb_attach(device_t parent, devic
 	bus_space_subregion(sc->sc_bst, exyoaa->exyo_core_bsh,
 		pmu_offset, EXYNOS_BLOCK_SIZE,
 		&sc->sc_pmuregs_bsh);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	/* power up USB subsystem */
 #ifdef EXYNOS4
 	if (IS_EXYNOS4_P()) {
 		exynos_gpio_pinset_acquire(&e4_uhost_pwr_pinset);
 		exynos_gpio_pinset_to_pindata(&e4_uhost_pwr_pinset, 6, &XuhostPWREN);
 		exynos_gpio_pinset_to_pindata(&e4_uhost_pwr_pinset, 7, &XuhostOVERCUR);
 		/* enable power and set Xuhost OVERCUR to inactive by pulling it up */
 		exynos_gpio_pindata_ctl(&XuhostPWREN, GPIO_PIN_PULLUP);
 		exynos_gpio_pindata_ctl(&XuhostOVERCUR, GPIO_PIN_PULLUP);
 		DELAY(80000);
+	}
 #endif
 #ifdef EXYNOS5
-	if (IS_EXYNOS5_P()) {
+	if (IS_EXYNOS5410_P()) {
 		struct exynos_gpio_pindata Xovercur2, Xovercur3;
 		struct exynos_gpio_pindata Xvbus;
 		/* BUS 0 */
 		exynos_gpio_pinset_acquire(&e5_usb3_bus0_pinset);
 		exynos_gpio_pinset_to_pindata(&e5_usb3_bus0_pinset, 0, &Xovercur2);
 		exynos_gpio_pinset_to_pindata(&e5_usb3_bus0_pinset, 1, &Xovercur3);
 		exynos_gpio_pinset_to_pindata(&e5_usb3_bus0_pinset, 3, &Xvbus);
 		/* enable power and set overcur inactive by pulling them up */
 		exynos_gpio_pindata_ctl(&Xvbus, GPIO_PIN_PULLUP);
 		exynos_gpio_pindata_ctl(&Xovercur2, GPIO_PIN_PULLUP);
 		exynos_gpio_pindata_ctl(&Xovercur3, GPIO_PIN_PULLUP);
 		/* BUS 1 */
 		exynos_gpio_pinset_acquire(&e5_usb3_bus1_pinset);
 		exynos_gpio_pinset_to_pindata(&e5_usb3_bus1_pinset, 4, &Xovercur2);
 		exynos_gpio_pinset_to_pindata(&e5_usb3_bus1_pinset, 5, &Xovercur3);
 		exynos_gpio_pinset_to_pindata(&e5_usb3_bus1_pinset, 7, &Xvbus);
 		/* enable power and set overcur inactive by pulling them up */
 		exynos_gpio_pindata_ctl(&Xvbus, GPIO_PIN_PULLUP);
 		exynos_gpio_pindata_ctl(&Xovercur2, GPIO_PIN_PULLUP);
 		exynos_gpio_pindata_ctl(&Xovercur3, GPIO_PIN_PULLUP);
 		/* enable power to the hub */
 		exynos_gpio_pinset_acquire(&e5_uhost_pwr_pinset);
 		exynos_gpio_pinset_to_pindata(&e5_uhost_pwr_pinset, 5, &XuhostPWREN);
 		exynos_gpio_pinset_to_pindata(&e5_uhost_pwr_pinset, 6, &XuhostOVERCUR);
 		/* enable power and set Xuhost OVERCUR to inactive by pulling it up */
 		exynos_gpio_pindata_ctl(&XuhostPWREN, GPIO_PIN_PULLUP);
 		exynos_gpio_pindata_ctl(&XuhostOVERCUR, GPIO_PIN_PULLUP);
 		DELAY(80000);
+	}
 #endif
 	/* enable power and set Xuhost OVERCUR to inactive by pulling it up */
 	exynos_gpio_pindata_ctl(&XuhostPWREN, GPIO_PIN_PULLUP);
 	exynos_gpio_pindata_ctl(&XuhostOVERCUR, GPIO_PIN_PULLUP);
 	DELAY(80000);
 	/* init USB phys */
 	exynos_usb_phy_init(sc);
 	/*
 	 * Disable interrupts
+	 *
 	 * To prevent OHCI lockups on Exynos5 SoCs, we first have to read the
 	 * address before we set it; this is most likely a bug in the SoC
 	 */
 #if NOHCI > 0
 	int regval;