[src/trunk]: src/sys/arch/arm/broadcom Make sure to bring the ULPI ports out ...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/40ac3dff980e
branches:  trunk
changeset: 782975:40ac3dff980e
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Nov 29 17:38:26 2012 +0000

description:
Make sure to bring the ULPI ports out of reset.

diffstat:

 sys/arch/arm/broadcom/bcm53xx_reg.h |   7 +++++++
 sys/arch/arm/broadcom/bcm53xx_usb.c |  11 ++++++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r e19a6ab12a1d -r 40ac3dff980e sys/arch/arm/broadcom/bcm53xx_reg.h
--- a/sys/arch/arm/broadcom/bcm53xx_reg.h       Thu Nov 29 17:36:56 2012 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_reg.h       Thu Nov 29 17:38:26 2012 +0000
@@ -658,6 +658,13 @@
 
 #endif /* IDM_PRIVATE */
 
+#ifdef USBH_PRIVATE
+#define        USBH_PHY_CTRL_P0                0x200
+#define        USBH_PHY_CTRL_P1                0x204
+
+#define        USBH_PHY_CTRL_INIT              0x3ff
+#endif
+
 #ifdef GMAC_PRIVATE
 
 struct gmac_txdb {
diff -r e19a6ab12a1d -r 40ac3dff980e sys/arch/arm/broadcom/bcm53xx_usb.c
--- a/sys/arch/arm/broadcom/bcm53xx_usb.c       Thu Nov 29 17:36:56 2012 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_usb.c       Thu Nov 29 17:38:26 2012 +0000
@@ -26,12 +26,13 @@
  * 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 <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.2 2012/09/27 00:24:36 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.3 2012/11/29 17:38:26 matt Exp $");
 
 #include <sys/bus.h>
 #include <sys/device.h>
@@ -242,6 +243,14 @@
            0x1000, &usbsc->usbsc_ohci_bsh);
 
        /*
+        * Bring the PHYs out of reset.
+        */
+       bus_space_write_4(usbsc->usbsc_bst, usbsc->usbsc_ehci_bsh,
+           USBH_PHY_CTRL_P0, USBH_PHY_CTRL_INIT);
+       bus_space_write_4(usbsc->usbsc_bst, usbsc->usbsc_ehci_bsh,
+           USBH_PHY_CTRL_P1, USBH_PHY_CTRL_INIT);
+
+       /*
         * Disable interrupts
         */
        bus_space_write_4(usbsc->usbsc_bst, usbsc->usbsc_ohci_bsh,