[src/trunk]: src/sys/arch/arm/allwinner CCU SCLK soft reset 1 bit 1 is for US...

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

details:   https://anonhg.NetBSD.org/src/rev/1c10b1d35930
branches:  trunk
changeset: 804946:1c10b1d35930
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Dec 07 16:20:33 2014 +0000

description:
CCU SCLK soft reset 1 bit 1 is for USB DRD, not host controller

diffstat:

 sys/arch/arm/allwinner/awin_reg.h |  2 +-
 sys/arch/arm/allwinner/awin_usb.c |  6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 12783866b215 -r 1c10b1d35930 sys/arch/arm/allwinner/awin_reg.h
--- a/sys/arch/arm/allwinner/awin_reg.h Sun Dec 07 15:00:37 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_reg.h Sun Dec 07 16:20:33 2014 +0000
@@ -2771,7 +2771,7 @@
 
 #define AWIN_A80_CCU_SCLK_BUS_SOFT_RST1_DMA    __BIT(24)
 #define AWIN_A80_CCU_SCLK_BUS_SOFT_RST1_GMAC   __BIT(17)
-#define AWIN_A80_CCU_SCLK_BUS_SOFT_RST1_USB_HOST __BIT(1)
+#define AWIN_A80_CCU_SCLK_BUS_SOFT_RST1_USB_DRD        __BIT(1)
 
 #define AWIN_A80_CCU_SCLK_BUS_SOFT_RST4_TWI4   __BIT(4)
 #define AWIN_A80_CCU_SCLK_BUS_SOFT_RST4_TWI3   __BIT(3)
diff -r 12783866b215 -r 1c10b1d35930 sys/arch/arm/allwinner/awin_usb.c
--- a/sys/arch/arm/allwinner/awin_usb.c Sun Dec 07 15:00:37 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_usb.c Sun Dec 07 16:20:33 2014 +0000
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.18 2014/12/05 17:32:08 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.19 2014/12/07 16:20:33 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -473,10 +473,6 @@
                awin_reg_set_clear(usbsc->usbsc_bst, aio->aio_ccm_bsh,
                    AWIN_A80_CCU_SCLK_BUS_CLK_GATING1_REG,
                    AWIN_A80_CCU_SCLK_BUS_CLK_GATING1_USB_HOST, 0);
-               /* Soft reset */
-               awin_reg_set_clear(usbsc->usbsc_bst, aio->aio_ccm_bsh,
-                   AWIN_A80_CCU_SCLK_BUS_SOFT_RST1_REG,
-                   AWIN_A80_CCU_SCLK_BUS_SOFT_RST1_USB_HOST, 0);
 
                /* Enable USB PHY */
                awin_reg_set_clear(usbsc->usbsc_bst, usb_bsh,