summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/export/as3525.h1
-rw-r--r--firmware/export/as3525v2.h2
-rw-r--r--firmware/target/arm/as3525/usb-drv-as3525v2.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h
index 52f10ef..e44b4ed 100644
--- a/firmware/export/as3525.h
+++ b/firmware/export/as3525.h
@@ -109,7 +109,6 @@
#define CCU_VERS (*(volatile unsigned long *)(CCU_BASE + 0x14))
#define CCU_SPARE1 (*(volatile unsigned long *)(CCU_BASE + 0x18))
#define CCU_SPARE2 (*(volatile unsigned long *)(CCU_BASE + 0x1C))
-#define CCU_USB_THINGY (*(volatile unsigned long *)(CCU_BASE + 0x20))
/* DBOP */
#define DBOP_TIMPOL_01 (*(volatile unsigned long *)(DBOP_BASE + 0x00))
diff --git a/firmware/export/as3525v2.h b/firmware/export/as3525v2.h
index 4b719a9..caae57e 100644
--- a/firmware/export/as3525v2.h
+++ b/firmware/export/as3525v2.h
@@ -40,4 +40,6 @@
#define USB_NUM_ENDPOINTS 6
+#define CCU_USB (*(volatile unsigned long *)(CCU_BASE + 0x20))
+
#endif /* __AS3525V2_H__ */
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c
index 2c0ca70..1514e76 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525v2.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c
@@ -156,9 +156,9 @@ static void as3525v2_connect(void)
GUSBCFG |= GUSBCFG_force_device_mode;
usb_delay();
/* 11) Do something that is probably CCU related but undocumented*/
- CCU_USB_THINGY &= ~0x1000;
+ CCU_USB &= ~0x1000;
usb_delay();
- CCU_USB_THINGY &= ~0x300000;
+ CCU_USB &= ~0x300000;
usb_delay();
/* 12) reset usb core parameters (dev addr, speed, ...) */
DCFG = 0;