1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 20:58:06 +02:00

jz4740: More udc cleanup. Enable usb ethernet gadget.

This commit is contained in:
Lars-Peter Clausen 2009-09-14 17:12:10 +02:00 committed by Xiangfu Liu
parent 8c57ef78b6
commit 299c9e29ef
3 changed files with 543 additions and 424 deletions

View File

@ -149,6 +149,7 @@ CONFIG_INET_TCP_DIAG=y
CONFIG_INPUT=y CONFIG_INPUT=y
# CONFIG_INPUT_GPIO_BUTTONS is not set # CONFIG_INPUT_GPIO_BUTTONS is not set
CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_KEYBOARD=y
# CONFIG_INPUT_YEALINK is not set
CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_CFQ=y CONFIG_IOSCHED_CFQ=y
# CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_ADVANCED_ROUTER is not set
@ -187,7 +188,7 @@ CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set
# CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_OPENWRT_CLUT224=y CONFIG_LOGO_OPENWRT_CLUT224
CONFIG_LZO_COMPRESS=y CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y CONFIG_LZO_DECOMPRESS=y
CONFIG_MAC80211_DEFAULT_PS_VALUE=0 CONFIG_MAC80211_DEFAULT_PS_VALUE=0
@ -301,6 +302,45 @@ CONFIG_UBIFS_FS=y
CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_LZO=y
# CONFIG_UBIFS_FS_XATTR is not set # CONFIG_UBIFS_FS_XATTR is not set
CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZLIB=y
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_CDC_COMPOSITE is not set
CONFIG_USB_ETH=y
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_FILE_STORAGE is not set
CONFIG_USB_GADGET=y
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_GADGET_AMD5536UDC is not set
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_ATMEL_USBA is not set
# CONFIG_USB_GADGET_CI13XXX is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_GADGET_DUMMY_HCD is not set
# CONFIG_USB_GADGET_FSL_QE is not set
# CONFIG_USB_GADGET_FSL_USB2 is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_IMX is not set
CONFIG_USB_GADGET_JZ4740=y
# CONFIG_USB_GADGET_LANGWELL is not set
# CONFIG_USB_GADGET_LH7A40X is not set
# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_MUSB_HDRC is not set
# CONFIG_USB_GADGET_NET2280 is not set
# CONFIG_USB_GADGET_OMAP is not set
# CONFIG_USB_GADGET_PXA25X is not set
# CONFIG_USB_GADGET_PXA27X is not set
# CONFIG_USB_GADGET_S3C2410 is not set
# CONFIG_USB_GADGET_S3C_HSOTG is not set
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_VBUS_DRAW=2
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_G_SERIAL is not set
CONFIG_USB_JZ4740=y
# CONFIG_USB_MIDI_GADGET is not set
CONFIG_USB_SUPPORT=y
# CONFIG_USB_ZERO is not set
# CONFIG_VGA_CONSOLE is not set # CONFIG_VGA_CONSOLE is not set
# CONFIG_VLAN_8021Q is not set # CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y

View File

@ -35,18 +35,18 @@ struct jz4740_ep {
struct jz4740_udc *dev; struct jz4740_udc *dev;
const struct usb_endpoint_descriptor *desc; const struct usb_endpoint_descriptor *desc;
struct list_head queue;
unsigned long pio_irqs; unsigned long pio_irqs;
u8 stopped; uint8_t stopped;
u8 bEndpointAddress; uint8_t bEndpointAddress;
u8 bmAttributes; uint8_t bmAttributes;
ep_type_t ep_type; ep_type_t type;
u32 fifo; size_t fifo;
u32 csr; u32 csr;
u32 reg_addr; uint32_t reg_addr;
struct list_head queue;
}; };
struct jz4740_request { struct jz4740_request {
@ -79,8 +79,13 @@ struct jz4740_udc {
unsigned char usb_address; unsigned char usb_address;
/* UDC state - Added by River */
udc_state_t state; udc_state_t state;
struct resource *mem;
void __iomem *base;
int irq;
uint32_t in_mask;
uint32_t out_mask;
}; };
extern struct jz4740_udc *the_controller; extern struct jz4740_udc *the_controller;
@ -88,6 +93,5 @@ extern struct jz4740_udc *the_controller;
#define ep_is_in(EP) (((EP)->bEndpointAddress&USB_DIR_IN)==USB_DIR_IN) #define ep_is_in(EP) (((EP)->bEndpointAddress&USB_DIR_IN)==USB_DIR_IN)
#define ep_maxpacket(EP) ((EP)->ep.maxpacket) #define ep_maxpacket(EP) ((EP)->ep.maxpacket)
#define ep_index(EP) ((EP)->bEndpointAddress&0xF) #define ep_index(EP) ((EP)->bEndpointAddress&0xF)
#define usb_set_index(i) (REG8(USB_REG_INDEX) = (i))
#endif /* __USB_GADGET_JZ4740_H__ */ #endif /* __USB_GADGET_JZ4740_H__ */