summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2013-08-11 19:21:24 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2013-08-11 19:21:24 +0200
commit737dafe7dfbc6c1e3dc54d8685bc5dffbcf13342 (patch)
tree39f60d0aa4a9fe315ce96ea93066c91b1b794991 /firmware/export
parent1b1692ff06a563db90e812a4edf8c1434bc4976d (diff)
downloadrockbox-737dafe7dfbc6c1e3dc54d8685bc5dffbcf13342.tar.gz
rockbox-737dafe7dfbc6c1e3dc54d8685bc5dffbcf13342.zip
Revert "rk27xx: implement usb driver"
This reverts commit 310f9e068d58d3113358e86d6dd239500cdd11c4.
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/config.h4
-rw-r--r--firmware/export/rk27xx.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index c252b44f4e..7252d62c5e 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -834,6 +834,7 @@ Lyre prototype 1 */
834#define USB_STATUS_BY_EVENT 834#define USB_STATUS_BY_EVENT
835#define USB_DETECT_BY_REQUEST 835#define USB_DETECT_BY_REQUEST
836#elif CONFIG_USBOTG == USBOTG_RK27XX 836#elif CONFIG_USBOTG == USBOTG_RK27XX
837#define USB_STATUS_BY_EVENT
837#define USB_DETECT_BY_REQUEST 838#define USB_DETECT_BY_REQUEST
838#endif /* CONFIG_USB == */ 839#endif /* CONFIG_USB == */
839#endif /* HAVE_USBSTACK */ 840#endif /* HAVE_USBSTACK */
@@ -1068,8 +1069,7 @@ Lyre prototype 1 */
1068#elif (CONFIG_USBOTG == USBOTG_ARC) || \ 1069#elif (CONFIG_USBOTG == USBOTG_ARC) || \
1069 (CONFIG_USBOTG == USBOTG_JZ4740) || \ 1070 (CONFIG_USBOTG == USBOTG_JZ4740) || \
1070 (CONFIG_USBOTG == USBOTG_M66591) || \ 1071 (CONFIG_USBOTG == USBOTG_M66591) || \
1071 (CONFIG_USBOTG == USBOTG_AS3525) || \ 1072 (CONFIG_USBOTG == USBOTG_AS3525)
1072 (CONFIG_USBOTG == USBOTG_RK27XX)
1073#define USB_HAS_BULK 1073#define USB_HAS_BULK
1074#define USB_HAS_INTERRUPT 1074#define USB_HAS_INTERRUPT
1075#elif defined(CPU_TCC780X) || defined(CPU_TCC77X) 1075#elif defined(CPU_TCC780X) || defined(CPU_TCC77X)
diff --git a/firmware/export/rk27xx.h b/firmware/export/rk27xx.h
index dc6bca7cbd..58b3fe8166 100644
--- a/firmware/export/rk27xx.h
+++ b/firmware/export/rk27xx.h
@@ -8,8 +8,7 @@
8#define FLASH_BANK1 0x11000000 8#define FLASH_BANK1 0x11000000
9 9
10#define USB_NUM_ENDPOINTS 16 10#define USB_NUM_ENDPOINTS 16
11/* cache aligned */ 11#define USB_DEVBSS_ATTR
12#define USB_DEVBSS_ATTR __attribute__((aligned(CACHEALIGN_SIZE)))
13 12
14/* Timers */ 13/* Timers */
15#define APB0_TIMER (ARM_BUS0_BASE + 0x00000000) 14#define APB0_TIMER (ARM_BUS0_BASE + 0x00000000)
@@ -812,7 +811,6 @@
812#define RXVOIDINTEN (1<<5) 811#define RXVOIDINTEN (1<<5)
813#define RXERRINTEN (1<<6) 812#define RXERRINTEN (1<<6)
814#define RXACKINTEN (1<<7) 813#define RXACKINTEN (1<<7)
815#define RXCFINTE (1<<12)
816/* bits 31:8 reserved for EP0 */ 814/* bits 31:8 reserved for EP0 */
817/* bits 31:14 reserved for others */ 815/* bits 31:14 reserved for others */
818 816
@@ -835,7 +833,6 @@
835#define TXERRINTEN (1<<5) 833#define TXERRINTEN (1<<5)
836#define TXACKINTEN (1<<6) 834#define TXACKINTEN (1<<6)
837#define TXDMADNEN (1<<7) /* reserved for EP0 */ 835#define TXDMADNEN (1<<7) /* reserved for EP0 */
838#define TXCFINTE (1<<12)
839/* bits 31:8 reserved */ 836/* bits 31:8 reserved */
840 837
841/* TXnBUF bits */ 838/* TXnBUF bits */