Module Name: src
Committed By: jmcneill
Date: Sun Dec 7 16:20:33 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_reg.h awin_usb.c
Log Message:
CCU SCLK soft reset 1 bit 1 is for USB DRD, not host controller
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/allwinner/awin_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.69 src/sys/arch/arm/allwinner/awin_reg.h:1.70
--- src/sys/arch/arm/allwinner/awin_reg.h:1.69 Sun Dec 7 12:44:24 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Sun Dec 7 16:20:33 2014
@@ -2771,7 +2771,7 @@ struct awin_a31_dma_desc {
#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)
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.18 src/sys/arch/arm/allwinner/awin_usb.c:1.19
--- src/sys/arch/arm/allwinner/awin_usb.c:1.18 Fri Dec 5 17:32:08 2014
+++ src/sys/arch/arm/allwinner/awin_usb.c Sun Dec 7 16:20:33 2014
@@ -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 @@ awinusb_attach(device_t parent, device_t
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,
