[src/matt-nb6-plus]: src/sys/arch/arm Sync with HEAD.

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

details:   https://anonhg.NetBSD.org/src/rev/88edb6c5f780
branches:  matt-nb6-plus
changeset: 774516:88edb6c5f780
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Nov 29 18:33:41 2012 +0000

description:
Sync with HEAD.

diffstat:

 sys/arch/arm/broadcom/bcm53xx_reg.h |   7 +++++++
 sys/arch/arm/broadcom/bcm53xx_usb.c |  11 ++++++++++-
 sys/arch/arm/cortex/a9tmr.c         |   6 +++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diffs (77 lines):

diff -r 2d60a4b68758 -r 88edb6c5f780 sys/arch/arm/broadcom/bcm53xx_reg.h
--- a/sys/arch/arm/broadcom/bcm53xx_reg.h       Thu Nov 29 16:31:01 2012 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_reg.h       Thu Nov 29 18:33:41 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 2d60a4b68758 -r 88edb6c5f780 sys/arch/arm/broadcom/bcm53xx_usb.c
--- a/sys/arch/arm/broadcom/bcm53xx_usb.c       Thu Nov 29 16:31:01 2012 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_usb.c       Thu Nov 29 18:33:41 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.4.2 2012/11/28 22:40:24 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.2.4.3 2012/11/29 18:42:05 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,
diff -r 2d60a4b68758 -r 88edb6c5f780 sys/arch/arm/cortex/a9tmr.c
--- a/sys/arch/arm/cortex/a9tmr.c       Thu Nov 29 16:31:01 2012 +0000
+++ b/sys/arch/arm/cortex/a9tmr.c       Thu Nov 29 18:33:41 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: a9tmr.c,v 1.3.4.2 2012/11/28 22:40:25 matt Exp $       */
+/*     $NetBSD: a9tmr.c,v 1.3.4.3 2012/11/29 18:33:41 matt Exp $       */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.3.4.2 2012/11/28 22:40:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.3.4.3 2012/11/29 18:33:41 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -196,7 +196,7 @@
         * Re-enable the comparator and now enable interrupts.
         */
        a9tmr_global_write(sc, TMR_GBL_INT, 1); /* clear interrupt pending */
-       ctl |= TMR_GBL_CTL_CMP_ENABLE | TMR_GBL_CTL_INT_ENABLE | TMR_GBL_CTL_AUTO_INC;
+       ctl |= TMR_GBL_CTL_CMP_ENABLE | TMR_GBL_CTL_INT_ENABLE | TMR_GBL_CTL_AUTO_INC | TMR_CTL_ENABLE;
        a9tmr_global_write(sc, TMR_GBL_CTL, ctl);
 #if 0
        printf("%s: %s: ctl %#x autoinc %u cmp %#x%08x now %#"PRIx64"\n",