svn commit: r314513 - in stable/11/sys: arm/freescale/imx dev/usb/controller

[Ian Lepore]

Author: ian
Date: Wed Mar  1 21:12:50 2017
New Revision: 314513
URL: https://svnweb.freebsd.org/changeset/base/314513

Log:
  MFC r313674:
  
    Enable usb low and full speed devices connected to the imx6 root hubs.

Modified:
  stable/11/sys/arm/freescale/imx/imx6_usbphy.c
  stable/11/sys/dev/usb/controller/ehci_imx.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/freescale/imx/imx6_usbphy.c
==============================================================================
--- stable/11/sys/arm/freescale/imx/imx6_usbphy.c	Wed Mar  1 21:11:36 2017	(r314512)
+++ stable/11/sys/arm/freescale/imx/imx6_usbphy.c	Wed Mar  1 21:12:50 2017	(r314513)
@@ -143,6 +143,10 @@ usbphy_attach(device_t dev)
 	bus_write_4(sc->mem_res, CTRL_SET_REG, CTRL_SFTRST);
 	bus_write_4(sc->mem_res, CTRL_CLR_REG, CTRL_SFTRST | CTRL_CLKGATE);
 
+	/* Set UTMI+ level 2+3 bits to enable low and full speed devices. */
+	bus_write_4(sc->mem_res, CTRL_SET_REG,
+	    CTRL_ENUTMILEVEL2 | CTRL_ENUTMILEVEL3);
+
 	/* Power up: clear all bits in the powerdown register. */
 	bus_write_4(sc->mem_res, PWD_REG, 0);
 

Modified: stable/11/sys/dev/usb/controller/ehci_imx.c
==============================================================================
--- stable/11/sys/dev/usb/controller/ehci_imx.c	Wed Mar  1 21:11:36 2017	(r314512)
+++ stable/11/sys/dev/usb/controller/ehci_imx.c	Wed Mar  1 21:12:50 2017	(r314513)
@@ -298,8 +298,9 @@ imx_ehci_attach(device_t dev)
 	 * Set flags that affect ehci_init() behavior, and hook our post-reset
 	 * code into the standard controller code.
 	 */
-	esc->sc_flags |= EHCI_SCFLG_NORESTERM;
+	esc->sc_flags |= EHCI_SCFLG_NORESTERM | EHCI_SCFLG_TT;
 	esc->sc_vendor_post_reset = imx_ehci_post_reset;
+	esc->sc_vendor_get_port_speed = ehci_get_port_speed_portsc;
 
 	err = ehci_init(esc);
 	if (err != 0) {