From 737dafe7dfbc6c1e3dc54d8685bc5dffbcf13342 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sun, 11 Aug 2013 19:21:24 +0200 Subject: Revert "rk27xx: implement usb driver" This reverts commit 310f9e068d58d3113358e86d6dd239500cdd11c4. --- firmware/export/config.h | 4 ++-- firmware/export/rk27xx.h | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'firmware/export') 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 */ #define USB_STATUS_BY_EVENT #define USB_DETECT_BY_REQUEST #elif CONFIG_USBOTG == USBOTG_RK27XX +#define USB_STATUS_BY_EVENT #define USB_DETECT_BY_REQUEST #endif /* CONFIG_USB == */ #endif /* HAVE_USBSTACK */ @@ -1068,8 +1069,7 @@ Lyre prototype 1 */ #elif (CONFIG_USBOTG == USBOTG_ARC) || \ (CONFIG_USBOTG == USBOTG_JZ4740) || \ (CONFIG_USBOTG == USBOTG_M66591) || \ - (CONFIG_USBOTG == USBOTG_AS3525) || \ - (CONFIG_USBOTG == USBOTG_RK27XX) + (CONFIG_USBOTG == USBOTG_AS3525) #define USB_HAS_BULK #define USB_HAS_INTERRUPT #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 @@ #define FLASH_BANK1 0x11000000 #define USB_NUM_ENDPOINTS 16 -/* cache aligned */ -#define USB_DEVBSS_ATTR __attribute__((aligned(CACHEALIGN_SIZE))) +#define USB_DEVBSS_ATTR /* Timers */ #define APB0_TIMER (ARM_BUS0_BASE + 0x00000000) @@ -812,7 +811,6 @@ #define RXVOIDINTEN (1<<5) #define RXERRINTEN (1<<6) #define RXACKINTEN (1<<7) -#define RXCFINTE (1<<12) /* bits 31:8 reserved for EP0 */ /* bits 31:14 reserved for others */ @@ -835,7 +833,6 @@ #define TXERRINTEN (1<<5) #define TXACKINTEN (1<<6) #define TXDMADNEN (1<<7) /* reserved for EP0 */ -#define TXCFINTE (1<<12) /* bits 31:8 reserved */ /* TXnBUF bits */ -- cgit v1.2.3