From 22cfbee27489d3658ab2155c65bcdfedce7e750c Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Tue, 18 May 2010 09:58:52 +0000 Subject: 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 --- firmware/export/as3525.h | 1 + firmware/export/config.h | 6 ++++-- firmware/export/config/sansaclipplus.h | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h index 1d5fb1d820..699762a9b2 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 070bd959b7..5e986d47b9 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 29694d87c2..55eacd2607 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 -- cgit v1.2.3