summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorAmaury Pouly <pamaury@rockbox.org>2010-05-18 09:58:52 +0000
committerAmaury Pouly <pamaury@rockbox.org>2010-05-18 09:58:52 +0000
commit22cfbee27489d3658ab2155c65bcdfedce7e750c (patch)
treeda28c1d243f518fbffa09bf625e4431a3c8811c7 /firmware/export
parented96c935ecc38cbad99742551d1e8e4e6082b6ce (diff)
downloadrockbox-22cfbee27489d3658ab2155c65bcdfedce7e750c.zip
rockbox-22cfbee27489d3658ab2155c65bcdfedce7e750c.tar.gz
rockbox-22cfbee27489d3658ab2155c65bcdfedce7e750c.tar.bz2
rockbox-22cfbee27489d3658ab2155c65bcdfedce7e750c.tar.xz
as3525v2: add usb driver stub, enable usb phy&core init
clip+: add USBOTG_ define and enable usb stack git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26132 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/as3525.h1
-rw-r--r--firmware/export/config.h6
-rw-r--r--firmware/export/config/sansaclipplus.h5
3 files changed, 8 insertions, 4 deletions
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h
index 1d5fb1d..699762a 100644
--- a/firmware/export/as3525.h
+++ b/firmware/export/as3525.h
@@ -110,6 +110,7 @@
#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/config.h b/firmware/export/config.h
index 070bd95..5e986d4 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -276,6 +276,7 @@ Lyre prototype 1 */
#define USBOTG_ARC 5020 /* PortalPlayer 502x */
#define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */
#define USBOTG_AS3525 3525 /* AMS AS3525 */
+#define USBOTG_AS3525v2 3535 /* AMS AS3525v2 */
#define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701 */
/* Multiple cores */
@@ -912,10 +913,11 @@ Lyre prototype 1 */
#ifndef SIMULATOR
//#define USB_ENABLE_SERIAL
-#define USB_ENABLE_STORAGE
+//#define USB_ENABLE_STORAGE
#ifdef USB_HAS_INTERRUPT
-#define USB_ENABLE_HID
+//#define USB_ENABLE_HID
+#define USB_ENABLE_CHARGING_ONLY
#else
#define USB_ENABLE_CHARGING_ONLY
#endif
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 29694d8..55eacd2 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -171,10 +171,11 @@
#ifndef BOOTLOADER
-#define USB_HANDLED_BY_OF
+//#define USB_HANDLED_BY_OF
+#define USE_ROCKBOX_USB
/* USB On-the-go */
-#define CONFIG_USBOTG USBOTG_AS3525
+#define CONFIG_USBOTG USBOTG_AS3525v2
/* enable these for the experimental usb stack */
#define HAVE_USBSTACK