Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

usb: musb-new: CONFIG_MUSB prefix replacement with CONFIG_USB_MUSB

Browse source 
USB-related options are usually prefixed with CONFIG_USB and platform-specific
adaptation for the MUSB controller already have a CONFIG_USB_MUSB prefix, so
this switches all MUSB-related options to a CONFIG_USB_MUSB prefix, for
consistency.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
This commit is contained in:
Paul Kocialkowski 2015-08-04 17:04:06 +02:00 committed by Marek Vasut
parent 68f7c5db2d
commit 95de1e2f26
54 changed files with 167 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv7/am33xx/board.c
View file

@ -124,7 +124,7 @@ int cpu_mmc_init(bd_t *bis)
#endif #endif
/* AM33XX has two MUSB controllers which can be host or gadget */ /* AM33XX has two MUSB controllers which can be host or gadget */
#if (defined(CONFIG_MUSB_GADGET) || defined(CONFIG_MUSB_HOST)) && \ #if (defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST)) && \
(defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1)) (defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1))
static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;

2
arch/arm/include/asm/arch-sunxi/usb_phy.h
View file

@ -21,7 +21,7 @@ int sunxi_usb_phy_id_detect(int index);
void sunxi_usb_phy_enable_squelch_detect(int index, int enable); void sunxi_usb_phy_enable_squelch_detect(int index, int enable);
/* Not really phy related, but we have to declare this somewhere ... */ /* Not really phy related, but we have to declare this somewhere ... */
#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET) #if defined(CONFIG_USB_MUSB_HOST) || defined(CONFIG_USB_MUSB_GADGET)
void sunxi_musb_board_init(void); void sunxi_musb_board_init(void);
#else #else
#define sunxi_musb_board_init() #define sunxi_musb_board_init()

2
board/birdland/bav335x/board.c
View file

@ -363,7 +363,7 @@ static struct cpsw_platform_data cpsw_data = {
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\
defined(CONFIG_SPL_BUILD)) || \ defined(CONFIG_SPL_BUILD)) || \
((defined(CONFIG_DRIVER_TI_CPSW) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \
defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
!defined(CONFIG_SPL_BUILD)) !defined(CONFIG_SPL_BUILD))
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {

6
board/compulab/cm_t3517/cm_t3517.c
View file

@ -50,12 +50,12 @@ static struct omap_musb_board_data cm_t3517_musb_board_data = {
}; };
static struct musb_hdrc_platform_data cm_t3517_musb_pdata = { static struct musb_hdrc_platform_data cm_t3517_musb_pdata = {
#if defined(CONFIG_MUSB_HOST) #if defined(CONFIG_USB_MUSB_HOST)
.mode = MUSB_HOST, .mode = MUSB_HOST,
#elif defined(CONFIG_MUSB_GADGET) #elif defined(CONFIG_USB_MUSB_GADGET)
.mode = MUSB_PERIPHERAL, .mode = MUSB_PERIPHERAL,
#else #else
#error "Please define either CONFIG_MUSB_HOST or CONFIG_MUSB_GADGET" #error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET"
#endif #endif
.config = &cm_t3517_musb_config, .config = &cm_t3517_musb_config,
.power = 250, .power = 250,

8
board/logicpd/am3517evm/am3517evm.c
View file

@ -65,12 +65,12 @@ static struct omap_musb_board_data musb_board_data = {
}; };
static struct musb_hdrc_platform_data musb_plat = { static struct musb_hdrc_platform_data musb_plat = {
#if defined(CONFIG_MUSB_HOST) #if defined(CONFIG_USB_MUSB_HOST)
.mode = MUSB_HOST, .mode = MUSB_HOST,
#elif defined(CONFIG_MUSB_GADGET) #elif defined(CONFIG_USB_MUSB_GADGET)
.mode = MUSB_PERIPHERAL, .mode = MUSB_PERIPHERAL,
#else #else
#error "Please define either CONFIG_MUSB_HOST or CONFIG_MUSB_GADGET" #error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET"
#endif #endif
.config = &musb_config, .config = &musb_config,
.power = 250, .power = 250,
@ -159,7 +159,7 @@ int board_mmc_init(bd_t *bis)
} }
#endif #endif
#if defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET) #if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
int rv, n = 0; int rv, n = 0;

2
board/phytec/pcm051/board.c
View file

@ -208,7 +208,7 @@ static struct cpsw_platform_data cpsw_data = {
#endif #endif
#if defined(CONFIG_DRIVER_TI_CPSW) || \ #if defined(CONFIG_DRIVER_TI_CPSW) || \
(defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) (defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET))
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
int rv, n = 0; int rv, n = 0;

2
board/siemens/draco/board.c
View file

@ -267,7 +267,7 @@ static struct cpsw_platform_data cpsw_data = {
}; };
#if defined(CONFIG_DRIVER_TI_CPSW) || \ #if defined(CONFIG_DRIVER_TI_CPSW) || \
(defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) (defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET))
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;

2
board/siemens/pxm2/board.c
View file

@ -213,7 +213,7 @@ static struct cpsw_platform_data cpsw_data = {
#endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */ #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
#if defined(CONFIG_DRIVER_TI_CPSW) || \ #if defined(CONFIG_DRIVER_TI_CPSW) || \
(defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) (defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET))
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
int n = 0; int n = 0;

2
board/siemens/rut/board.c
View file

@ -174,7 +174,7 @@ static struct cpsw_platform_data cpsw_data = {
}; };
#if defined(CONFIG_DRIVER_TI_CPSW) || \ #if defined(CONFIG_DRIVER_TI_CPSW) || \
(defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) (defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET))
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;

2
board/ti/am335x/board.c
View file

@ -569,7 +569,7 @@ static struct cpsw_platform_data cpsw_data = {
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \
&& defined(CONFIG_SPL_BUILD)) || \ && defined(CONFIG_SPL_BUILD)) || \
((defined(CONFIG_DRIVER_TI_CPSW) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \
defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
!defined(CONFIG_SPL_BUILD)) !defined(CONFIG_SPL_BUILD))
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {

8
board/ti/beagle/beagle.c
View file

@ -306,12 +306,12 @@ static struct omap_musb_board_data musb_board_data = {
}; };
static struct musb_hdrc_platform_data musb_plat = { static struct musb_hdrc_platform_data musb_plat = {
#if defined(CONFIG_MUSB_HOST) #if defined(CONFIG_USB_MUSB_HOST)
.mode = MUSB_HOST, .mode = MUSB_HOST,
#elif defined(CONFIG_MUSB_GADGET) #elif defined(CONFIG_USB_MUSB_GADGET)
.mode = MUSB_PERIPHERAL, .mode = MUSB_PERIPHERAL,
#else #else
#error "Please define either CONFIG_MUSB_HOST or CONFIG_MUSB_GADGET" #error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET"
#endif #endif
.config = &musb_config, .config = &musb_config,
.power = 100, .power = 100,
@ -568,7 +568,7 @@ int ehci_hcd_stop(int index)
#endif /* CONFIG_USB_EHCI */ #endif /* CONFIG_USB_EHCI */
#if defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET) #if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
return usb_eth_initialize(bis); return usb_eth_initialize(bis);

2
board/vscom/baltos/board.c
View file

@ -407,7 +407,7 @@ static struct cpsw_platform_data cpsw_data = {
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \
&& defined(CONFIG_SPL_BUILD)) || \ && defined(CONFIG_SPL_BUILD)) || \
((defined(CONFIG_DRIVER_TI_CPSW) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \
defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
!defined(CONFIG_SPL_BUILD)) !defined(CONFIG_SPL_BUILD))
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {

2
drivers/usb/gadget/gadget_chips.h
View file

@ -125,7 +125,7 @@
#endif #endif
/* Mentor high speed "dual role" controller, in peripheral role */ /* Mentor high speed "dual role" controller, in peripheral role */
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define gadget_is_musbhdrc(g) (!strcmp("musb-hdrc", (g)->name)) #define gadget_is_musbhdrc(g) (!strcmp("musb-hdrc", (g)->name))
#else #else
#define gadget_is_musbhdrc(g) 0 #define gadget_is_musbhdrc(g) 0

6
drivers/usb/musb-new/Makefile
View file

@ -2,9 +2,9 @@
# for USB OTG silicon based on Mentor Graphics INVENTRA designs # for USB OTG silicon based on Mentor Graphics INVENTRA designs
# #
obj-$(CONFIG_MUSB_GADGET) += musb_gadget.o musb_gadget_ep0.o musb_core.o obj-$(CONFIG_USB_MUSB_GADGET) += musb_gadget.o musb_gadget_ep0.o musb_core.o
obj-$(CONFIG_MUSB_GADGET) += musb_uboot.o obj-$(CONFIG_USB_MUSB_GADGET) += musb_uboot.o
obj-$(CONFIG_MUSB_HOST) += musb_host.o musb_core.o musb_uboot.o obj-$(CONFIG_USB_MUSB_HOST) += musb_host.o musb_core.o musb_uboot.o
obj-$(CONFIG_USB_MUSB_DSPS) += musb_dsps.o obj-$(CONFIG_USB_MUSB_DSPS) += musb_dsps.o
obj-$(CONFIG_USB_MUSB_AM35X) += am35x.o obj-$(CONFIG_USB_MUSB_AM35X) += am35x.o
obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o

12
drivers/usb/musb-new/musb_core.c
View file

@ -1437,7 +1437,7 @@ static int __devinit musb_core_init(u16 musb_type, struct musb *musb)
strcat(aInfo, ", dyn FIFOs"); strcat(aInfo, ", dyn FIFOs");
musb->dyn_fifo = true; musb->dyn_fifo = true;
} }
#ifndef CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #ifndef CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
if (reg & MUSB_CONFIGDATA_MPRXE) { if (reg & MUSB_CONFIGDATA_MPRXE) {
strcat(aInfo, ", bulk combine"); strcat(aInfo, ", bulk combine");
musb->bulk_combine = true; musb->bulk_combine = true;
@ -1662,7 +1662,7 @@ irqreturn_t musb_interrupt(struct musb *musb)
} }
EXPORT_SYMBOL_GPL(musb_interrupt); EXPORT_SYMBOL_GPL(musb_interrupt);
#ifndef CONFIG_MUSB_PIO_ONLY #ifndef CONFIG_USB_MUSB_PIO_ONLY
static bool __devinitdata use_dma = 1; static bool __devinitdata use_dma = 1;
/* "modprobe ... use_dma=0" etc */ /* "modprobe ... use_dma=0" etc */
@ -2011,7 +2011,7 @@ musb_init_controller(struct musb_hdrc_platform_data *plat, struct device *dev,
pm_runtime_get_sync(musb->controller); pm_runtime_get_sync(musb->controller);
#ifndef CONFIG_MUSB_PIO_ONLY #ifndef CONFIG_USB_MUSB_PIO_ONLY
if (use_dma && dev->dma_mask) { if (use_dma && dev->dma_mask) {
struct dma_controller *c; struct dma_controller *c;
@ -2194,7 +2194,7 @@ fail0:
* bridge to a platform device; this driver then suffices. * bridge to a platform device; this driver then suffices.
*/ */
#ifndef CONFIG_MUSB_PIO_ONLY #ifndef CONFIG_USB_MUSB_PIO_ONLY
static u64 *orig_dma_mask; static u64 *orig_dma_mask;
#endif #endif
@ -2217,7 +2217,7 @@ static int __devinit musb_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
#ifndef CONFIG_MUSB_PIO_ONLY #ifndef CONFIG_USB_MUSB_PIO_ONLY
/* clobbered by use_dma=n */ /* clobbered by use_dma=n */
orig_dma_mask = dev->dma_mask; orig_dma_mask = dev->dma_mask;
#endif #endif
@ -2244,7 +2244,7 @@ static int __devexit musb_remove(struct platform_device *pdev)
musb_free(musb); musb_free(musb);
iounmap(ctrl_base); iounmap(ctrl_base);
device_init_wakeup(&pdev->dev, 0); device_init_wakeup(&pdev->dev, 0);
#ifndef CONFIG_MUSB_PIO_ONLY #ifndef CONFIG_USB_MUSB_PIO_ONLY
pdev->dev.dma_mask = orig_dma_mask; pdev->dev.dma_mask = orig_dma_mask;
#endif #endif
return 0; return 0;

4
drivers/usb/musb-new/musb_core.h
View file

@ -97,7 +97,7 @@ struct musb_ep;
#ifndef __UBOOT__ #ifndef __UBOOT__
#define is_peripheral_capable() (1) #define is_peripheral_capable() (1)
#else #else
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define is_peripheral_capable() (1) #define is_peripheral_capable() (1)
#else #else
#define is_peripheral_capable() (0) #define is_peripheral_capable() (0)
@ -118,7 +118,7 @@ extern void musb_g_disconnect(struct musb *);
#ifndef __UBOOT__ #ifndef __UBOOT__
#define is_host_capable() (1) #define is_host_capable() (1)
#else #else
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define is_host_capable() (1) #define is_host_capable() (1)
#else #else
#define is_host_capable() (0) #define is_host_capable() (0)

2
drivers/usb/musb-new/musb_dma.h
View file

@ -62,7 +62,7 @@ struct musb_hw_ep;
#define DMA_ADDR_INVALID (~(dma_addr_t)0) #define DMA_ADDR_INVALID (~(dma_addr_t)0)
#ifndef CONFIG_MUSB_PIO_ONLY #ifndef CONFIG_USB_MUSB_PIO_ONLY
#define is_dma_capable() (1) #define is_dma_capable() (1)
#else #else
#define is_dma_capable() (0) #define is_dma_capable() (0)

4
drivers/usb/musb-new/musb_gadget.c
View file

@ -99,7 +99,7 @@
#define is_buffer_mapped(req) (is_dma_capable() && \ #define is_buffer_mapped(req) (is_dma_capable() && \
(req->map_state != UN_MAPPED)) (req->map_state != UN_MAPPED))
#ifndef CONFIG_MUSB_PIO_ONLY #ifndef CONFIG_USB_MUSB_PIO_ONLY
/* Maps the buffer to dma */ /* Maps the buffer to dma */
static inline void map_dma_buffer(struct musb_request *request, static inline void map_dma_buffer(struct musb_request *request,
@ -382,7 +382,7 @@ static void txstate(struct musb *musb, struct musb_request *req)
epnum, musb_ep->packet_sz, fifo_count, epnum, musb_ep->packet_sz, fifo_count,
csr); csr);
#ifndef CONFIG_MUSB_PIO_ONLY #ifndef CONFIG_USB_MUSB_PIO_ONLY
if (is_buffer_mapped(req)) { if (is_buffer_mapped(req)) {
struct dma_controller *c = musb->dma_controller; struct dma_controller *c = musb->dma_controller;
size_t request_size; size_t request_size;

12
drivers/usb/musb-new/musb_uboot.c
View file

@ -15,7 +15,7 @@
#include "musb_gadget.h" #include "musb_gadget.h"
#include "musb_uboot.h" #include "musb_uboot.h"
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
struct int_queue { struct int_queue {
struct usb_host_endpoint hep; struct usb_host_endpoint hep;
struct urb urb; struct urb urb;
@ -368,9 +368,9 @@ struct dm_usb_ops musb_usb_ops = {
.reset_root_port = musb_reset_root_port, .reset_root_port = musb_reset_root_port,
}; };
#endif /* CONFIG_DM_USB */ #endif /* CONFIG_DM_USB */
#endif /* CONFIG_MUSB_HOST */ #endif /* CONFIG_USB_MUSB_HOST */
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
static struct musb *gadget; static struct musb *gadget;
int usb_gadget_handle_interrupts(int index) int usb_gadget_handle_interrupts(int index)
@ -420,7 +420,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
driver->unbind(&gadget->g); driver->unbind(&gadget->g);
return 0; return 0;
} }
#endif /* CONFIG_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
int musb_register(struct musb_hdrc_platform_data *plat, void *bdata, int musb_register(struct musb_hdrc_platform_data *plat, void *bdata,
void *ctl_regs) void *ctl_regs)
@ -428,12 +428,12 @@ int musb_register(struct musb_hdrc_platform_data *plat, void *bdata,
struct musb **musbp; struct musb **musbp;
switch (plat->mode) { switch (plat->mode) {
#if defined(CONFIG_MUSB_HOST) && !defined(CONFIG_DM_USB) #if defined(CONFIG_USB_MUSB_HOST) && !defined(CONFIG_DM_USB)
case MUSB_HOST: case MUSB_HOST:
musbp = &musb_host.host; musbp = &musb_host.host;
break; break;
#endif #endif
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
case MUSB_PERIPHERAL: case MUSB_PERIPHERAL:
musbp = &gadget; musbp = &gadget;
break; break;

6
drivers/usb/musb-new/sunxi.c
View file

@ -286,7 +286,7 @@ static struct musb_hdrc_config musb_config = {
}; };
static struct musb_hdrc_platform_data musb_plat = { static struct musb_hdrc_platform_data musb_plat = {
#if defined(CONFIG_MUSB_HOST) #if defined(CONFIG_USB_MUSB_HOST)
.mode = MUSB_HOST, .mode = MUSB_HOST,
#else #else
.mode = MUSB_PERIPHERAL, .mode = MUSB_PERIPHERAL,
@ -296,7 +296,7 @@ static struct musb_hdrc_platform_data musb_plat = {
.platform_ops = &sunxi_musb_ops, .platform_ops = &sunxi_musb_ops,
}; };
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
int musb_usb_probe(struct udevice *dev) int musb_usb_probe(struct udevice *dev)
{ {
struct musb_host_data *host = dev_get_priv(dev); struct musb_host_data *host = dev_get_priv(dev);
@ -341,7 +341,7 @@ U_BOOT_DRIVER(usb_musb) = {
void sunxi_musb_board_init(void) void sunxi_musb_board_init(void)
{ {
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
struct udevice *dev; struct udevice *dev;
/* /*

4
drivers/usb/musb/Makefile
View file

@ -5,8 +5,8 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
obj-$(CONFIG_MUSB_HCD) += musb_hcd.o musb_core.o obj-$(CONFIG_USB_MUSB_HCD) += musb_hcd.o musb_core.o
obj-$(CONFIG_MUSB_UDC) += musb_udc.o musb_core.o obj-$(CONFIG_USB_MUSB_UDC) += musb_udc.o musb_core.o
obj-$(CONFIG_USB_BLACKFIN) += blackfin_usb.o obj-$(CONFIG_USB_BLACKFIN) += blackfin_usb.o
obj-$(CONFIG_USB_DAVINCI) += davinci.o obj-$(CONFIG_USB_DAVINCI) += davinci.o
obj-$(CONFIG_USB_OMAP3) += omap3.o obj-$(CONFIG_USB_OMAP3) += omap3.o

8
drivers/usb/musb/musb_core.c
View file

@ -19,7 +19,7 @@ struct musb_regs *musbr;
*/ */
void musb_start(void) void musb_start(void)
{ {
#if defined(CONFIG_MUSB_HCD) #if defined(CONFIG_USB_MUSB_HCD)
u8 devctl; u8 devctl;
u8 busctl; u8 busctl;
#endif #endif
@ -32,7 +32,7 @@ void musb_start(void)
/* put into basic highspeed mode and start session */ /* put into basic highspeed mode and start session */
writeb(MUSB_POWER_HSENAB, &musbr->power); writeb(MUSB_POWER_HSENAB, &musbr->power);
#if defined(CONFIG_MUSB_HCD) #if defined(CONFIG_USB_MUSB_HCD)
/* Program PHY to use EXT VBUS if required */ /* Program PHY to use EXT VBUS if required */
if (musb_cfg.extvbus == 1) { if (musb_cfg.extvbus == 1) {
busctl = musb_read_ulpi_buscontrol(musbr); busctl = musb_read_ulpi_buscontrol(musbr);
@ -81,7 +81,7 @@ void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt)
config_fifo(tx, idx, fifoaddr); config_fifo(tx, idx, fifoaddr);
csr = readw(&musbr->txcsr); csr = readw(&musbr->txcsr);
#if defined(CONFIG_MUSB_HCD) #if defined(CONFIG_USB_MUSB_HCD)
/* clear the data toggle bit */ /* clear the data toggle bit */
writew(csr | MUSB_TXCSR_CLRDATATOG, &musbr->txcsr); writew(csr | MUSB_TXCSR_CLRDATATOG, &musbr->txcsr);
#endif #endif
@ -94,7 +94,7 @@ void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt)
config_fifo(rx, idx, fifoaddr); config_fifo(rx, idx, fifoaddr);
csr = readw(&musbr->rxcsr); csr = readw(&musbr->rxcsr);
#if defined(CONFIG_MUSB_HCD) #if defined(CONFIG_USB_MUSB_HCD)
/* clear the data toggle bit */ /* clear the data toggle bit */
writew(csr | MUSB_RXCSR_CLRDATATOG, &musbr->rxcsr); writew(csr | MUSB_RXCSR_CLRDATATOG, &musbr->rxcsr);
#endif #endif

6
drivers/usb/musb/musb_hcd.c
View file

@ -117,7 +117,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
{ {
u16 csr; u16 csr;
int result = 1; int result = 1;
int timeout = CONFIG_MUSB_TIMEOUT; int timeout = CONFIG_USB_MUSB_TIMEOUT;
while (result > 0) { while (result > 0) {
csr = readw(&musbr->txcsr); csr = readw(&musbr->txcsr);
@ -179,7 +179,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
static int wait_until_txep_ready(struct usb_device *dev, u8 ep) static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
{ {
u16 csr; u16 csr;
int timeout = CONFIG_MUSB_TIMEOUT; int timeout = CONFIG_USB_MUSB_TIMEOUT;
do { do {
if (check_stall(ep, 1)) { if (check_stall(ep, 1)) {
@ -211,7 +211,7 @@ static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
static int wait_until_rxep_ready(struct usb_device *dev, u8 ep) static int wait_until_rxep_ready(struct usb_device *dev, u8 ep)
{ {
u16 csr; u16 csr;
int timeout = CONFIG_MUSB_TIMEOUT; int timeout = CONFIG_USB_MUSB_TIMEOUT;
do { do {
if (check_stall(ep, 0)) { if (check_stall(ep, 0)) {

4
drivers/usb/musb/musb_hcd.h
View file

@ -17,8 +17,8 @@
extern unsigned char new[]; extern unsigned char new[];
#endif #endif
#ifndef CONFIG_MUSB_TIMEOUT #ifndef CONFIG_USB_MUSB_TIMEOUT
# define CONFIG_MUSB_TIMEOUT 100000 # define CONFIG_USB_MUSB_TIMEOUT 100000
#endif #endif
/* This defines the endpoint number used for control transfers */ /* This defines the endpoint number used for control transfers */

16
include/configs/am335x_evm.h
View file

@ -283,14 +283,14 @@
*/ */
#define CONFIG_USB_MUSB_DSPS #define CONFIG_USB_MUSB_DSPS
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_MUSB_GADGET #define CONFIG_USB_MUSB_GADGET
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
#define CONFIG_USB_GADGET #define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DOWNLOAD
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
@ -309,12 +309,12 @@
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
#endif #endif
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif #endif
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
@ -323,7 +323,7 @@
#define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
#define CONFIG_G_DNL_PRODUCT_NUM 0xD022 #define CONFIG_G_DNL_PRODUCT_NUM 0xD022
#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
#endif /* CONFIG_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
/* Remove other SPL modes. */ /* Remove other SPL modes. */
@ -333,7 +333,7 @@
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#undef CONFIG_ENV_IS_IN_NAND #undef CONFIG_ENV_IS_IN_NAND
/* disable host part of MUSB in SPL */ /* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST #undef CONFIG_USB_MUSB_HOST
/* disable EFI partitions and partition UUID support */ /* disable EFI partitions and partition UUID support */
#undef CONFIG_PARTITION_UUIDS #undef CONFIG_PARTITION_UUIDS
#undef CONFIG_EFI_PARTITION #undef CONFIG_EFI_PARTITION

14
include/configs/am3517_crane.h
View file

@ -91,15 +91,15 @@
/* /*
* USB configuration * USB configuration
* Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard * Enable CONFIG_USB_MUSB_HCD for Host functionalities MSC, keyboard
* Enable CONFIG_MUSB_UDC for Device functionalities. * Enable CONFIG_USB_MUSB_UDC for Device functionalities.
*/ */
#define CONFIG_USB_AM35X 1 #define CONFIG_USB_AM35X 1
#define CONFIG_MUSB_HCD 1 #define CONFIG_USB_MUSB_HCD 1
#ifdef CONFIG_USB_AM35X #ifdef CONFIG_USB_AM35X
#ifdef CONFIG_MUSB_HCD #ifdef CONFIG_USB_MUSB_HCD
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
@ -111,9 +111,9 @@
#define CONFIG_PREBOOT "usb start" #define CONFIG_PREBOOT "usb start"
#endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_USB_KEYBOARD */
#endif /* CONFIG_MUSB_HCD */ #endif /* CONFIG_USB_MUSB_HCD */
#ifdef CONFIG_MUSB_UDC #ifdef CONFIG_USB_MUSB_UDC
/* USB device configuration */ /* USB device configuration */
#define CONFIG_USB_DEVICE 1 #define CONFIG_USB_DEVICE 1
#define CONFIG_USB_TTY 1 #define CONFIG_USB_TTY 1
@ -123,7 +123,7 @@
#define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_PRODUCTID 0x5678
#define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_MANUFACTURER "Texas Instruments"
#define CONFIG_USBD_PRODUCT_NAME "AM3517CRANE" #define CONFIG_USBD_PRODUCT_NAME "AM3517CRANE"
#endif /* CONFIG_MUSB_UDC */ #endif /* CONFIG_USB_MUSB_UDC */
#endif /* CONFIG_USB_AM35X */ #endif /* CONFIG_USB_AM35X */

16
include/configs/am3517_evm.h
View file

@ -97,16 +97,16 @@
/* /*
* USB configuration * USB configuration
* Enable CONFIG_MUSB_HOST for Host functionalities MSC, keyboard * Enable CONFIG_USB_MUSB_HOST for Host functionalities MSC, keyboard
* Enable CONFIG_MUSB_GADGET for Device functionalities. * Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
*/ */
#define CONFIG_USB_MUSB_AM35X #define CONFIG_USB_MUSB_AM35X
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#ifdef CONFIG_USB_MUSB_AM35X #ifdef CONFIG_USB_MUSB_AM35X
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
@ -118,13 +118,13 @@
#define CONFIG_PREBOOT "usb start" #define CONFIG_PREBOOT "usb start"
#endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_USB_KEYBOARD */
#endif /* CONFIG_MUSB_HOST */ #endif /* CONFIG_USB_MUSB_HOST */
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#endif /* CONFIG_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
#endif /* CONFIG_USB_MUSB_AM35X */ #endif /* CONFIG_USB_MUSB_AM35X */

16
include/configs/baltos.h
View file

@ -273,25 +273,25 @@
*/ */
#define CONFIG_USB_MUSB_DSPS #define CONFIG_USB_MUSB_DSPS
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_MUSB_GADGET #define CONFIG_USB_MUSB_GADGET
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
#define CONFIG_USB_GADGET #define CONFIG_USB_GADGET
#define CONFIG_USBDOWNLOAD_GADGET #define CONFIG_USBDOWNLOAD_GADGET
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB0_MODE MUSB_HOST
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_OTG #define CONFIG_AM335X_USB1_MODE MUSB_OTG
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif #endif
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
@ -300,11 +300,11 @@
#define CONFIG_G_DNL_VENDOR_NUM 0x0403 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
#endif /* CONFIG_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
/* disable host part of MUSB in SPL */ /* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST #undef CONFIG_USB_MUSB_HOST
/* disable EFI partitions and partition UUID support */ /* disable EFI partitions and partition UUID support */
#undef CONFIG_PARTITION_UUIDS #undef CONFIG_PARTITION_UUIDS
#undef CONFIG_EFI_PARTITION #undef CONFIG_EFI_PARTITION

16
include/configs/bav335x.h
View file

@ -440,14 +440,14 @@ DEFAULT_LINUX_BOOT_ENV \
*/ */
#define CONFIG_USB_MUSB_DSPS #define CONFIG_USB_MUSB_DSPS
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_MUSB_GADGET #define CONFIG_USB_MUSB_GADGET
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
#define CONFIG_USB_GADGET #define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DOWNLOAD
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
@ -466,12 +466,12 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
#endif #endif
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif #endif
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE
#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE
@ -479,11 +479,11 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
#define CONFIG_G_DNL_PRODUCT_NUM 0xD022 #define CONFIG_G_DNL_PRODUCT_NUM 0xD022
#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
#endif /* CONFIG_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
/* disable host part of MUSB in SPL */ /* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST #undef CONFIG_USB_MUSB_HOST
/* disable EFI partitions and partition UUID support */ /* disable EFI partitions and partition UUID support */
#undef CONFIG_PARTITION_UUIDS #undef CONFIG_PARTITION_UUIDS
#undef CONFIG_EFI_PARTITION #undef CONFIG_EFI_PARTITION

4
include/configs/bf526-ezbrd.h
View file

@ -136,10 +136,10 @@
*/ */
#if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__)
#define CONFIG_USB #define CONFIG_USB
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
#define CONFIG_USB_BLACKFIN #define CONFIG_USB_BLACKFIN
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_MUSB_TIMEOUT 100000 #define CONFIG_USB_MUSB_TIMEOUT 100000
#endif #endif

4
include/configs/bf527-ezkit.h
View file

@ -139,10 +139,10 @@
*/ */
#if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__)
#define CONFIG_USB #define CONFIG_USB
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
#define CONFIG_USB_BLACKFIN #define CONFIG_USB_BLACKFIN
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_MUSB_TIMEOUT 100000 #define CONFIG_USB_MUSB_TIMEOUT 100000
#endif #endif
/* Don't waste time transferring a logo over the UART */ /* Don't waste time transferring a logo over the UART */

4
include/configs/bf548-ezkit.h
View file

@ -163,10 +163,10 @@
*/ */
#if !defined(__ADSPBF544__) #if !defined(__ADSPBF544__)
#define CONFIG_USB #define CONFIG_USB
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
#define CONFIG_USB_BLACKFIN #define CONFIG_USB_BLACKFIN
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_MUSB_TIMEOUT 100000 #define CONFIG_USB_MUSB_TIMEOUT 100000
#endif #endif

2
include/configs/cam_enc_4xx.h
View file

@ -488,7 +488,7 @@
/* USB Configuration */ /* USB Configuration */
#define CONFIG_USB_DAVINCI #define CONFIG_USB_DAVINCI
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
#define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN | \ #define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN | \
USBPHY_PHY24MHZ) USBPHY_PHY24MHZ)

2
include/configs/cm_t35.h
View file

@ -100,7 +100,7 @@
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_EHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_MUSB_UDC #define CONFIG_USB_MUSB_UDC
#define CONFIG_TWL4030_USB #define CONFIG_TWL4030_USB
#define CONFIG_CMD_USB #define CONFIG_CMD_USB

4
include/configs/cm_t3517.h
View file

@ -112,8 +112,8 @@
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
#else /* !CONFIG_USB_MUSB_AM35X */ #else /* !CONFIG_USB_MUSB_AM35X */
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#endif /* CONFIG_USB_MUSB_AM35X */ #endif /* CONFIG_USB_MUSB_AM35X */
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE

10
include/configs/da830evm.h
View file

@ -135,7 +135,7 @@
* USB configuration * USB configuration
*/ */
#define CONFIG_USB_DA8XX /* Platform hookup to MUSB controller */ #define CONFIG_USB_DA8XX /* Platform hookup to MUSB controller */
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
/* /*
* U-Boot general configuration * U-Boot general configuration
@ -233,7 +233,7 @@
#ifdef CONFIG_USB_DA8XX #ifdef CONFIG_USB_DA8XX
#ifdef CONFIG_MUSB_HCD /* include support for usb host */ #ifdef CONFIG_USB_MUSB_HCD /* include support for usb host */
#define CONFIG_CMD_USB /* include support for usb cmd */ #define CONFIG_CMD_USB /* include support for usb cmd */
#define CONFIG_USB_STORAGE /* MSC class support */ #define CONFIG_USB_STORAGE /* MSC class support */
@ -244,9 +244,9 @@
#define CONFIG_PREBOOT "usb start" #define CONFIG_PREBOOT "usb start"
#endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_USB_KEYBOARD */
#endif /* CONFIG_MUSB_HCD */ #endif /* CONFIG_USB_MUSB_HCD */
#ifdef CONFIG_MUSB_UDC #ifdef CONFIG_USB_MUSB_UDC
/* USB device configuration */ /* USB device configuration */
#define CONFIG_USB_DEVICE 1 #define CONFIG_USB_DEVICE 1
#define CONFIG_USB_TTY 1 #define CONFIG_USB_TTY 1
@ -256,7 +256,7 @@
#define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_PRODUCTID 0x5678
#define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_MANUFACTURER "Texas Instruments"
#define CONFIG_USBD_PRODUCT_NAME "DA830EVM" #define CONFIG_USBD_PRODUCT_NAME "DA830EVM"
#endif /* CONFIG_MUSB_UDC */ #endif /* CONFIG_USB_MUSB_UDC */
#endif /* CONFIG_USB_DA8XX */ #endif /* CONFIG_USB_DA8XX */

4
include/configs/davinci_dm355evm.h
View file

@ -96,11 +96,11 @@
#endif #endif
#ifdef CONFIG_USB_DAVINCI #ifdef CONFIG_USB_DAVINCI
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#else #else
#undef CONFIG_MUSB_HCD #undef CONFIG_USB_MUSB_HCD
#undef CONFIG_CMD_USB #undef CONFIG_CMD_USB
#undef CONFIG_USB_STORAGE #undef CONFIG_USB_STORAGE
#endif #endif

10
include/configs/davinci_dm365evm.h
View file

@ -78,7 +78,7 @@
/* USB Configuration */ /* USB Configuration */
#define CONFIG_USB_DAVINCI #define CONFIG_USB_DAVINCI
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
#ifdef CONFIG_USB_DAVINCI #ifdef CONFIG_USB_DAVINCI
#define CONFIG_CMD_USB /* include support for usb */ #define CONFIG_CMD_USB /* include support for usb */
@ -87,7 +87,7 @@
#define CONFIG_DOS_PARTITION /* include support for FAT/storage*/ #define CONFIG_DOS_PARTITION /* include support for FAT/storage*/
#endif #endif
#ifdef CONFIG_MUSB_HCD /* include support for usb host */ #ifdef CONFIG_USB_MUSB_HCD /* include support for usb host */
#define CONFIG_CMD_USB /* include support for usb cmd */ #define CONFIG_CMD_USB /* include support for usb cmd */
#define CONFIG_USB_STORAGE /* MSC class support */ #define CONFIG_USB_STORAGE /* MSC class support */
#define CONFIG_CMD_STORAGE /* inclue support for usb-storage cmd */ #define CONFIG_CMD_STORAGE /* inclue support for usb-storage cmd */
@ -99,9 +99,9 @@
#define CONFIG_PREBOOT "usb start" #define CONFIG_PREBOOT "usb start"
#endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_USB_KEYBOARD */
#endif /* CONFIG_MUSB_HCD */ #endif /* CONFIG_USB_MUSB_HCD */
#ifdef CONFIG_MUSB_UDC #ifdef CONFIG_USB_MUSB_UDC
#define CONFIG_USB_DEVICE 1 #define CONFIG_USB_DEVICE 1
#define CONFIG_USB_TTY 1 #define CONFIG_USB_TTY 1
#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
@ -109,7 +109,7 @@
#define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_PRODUCTID 0x5678
#define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_MANUFACTURER "Texas Instruments"
#define CONFIG_USBD_PRODUCT_NAME "DM365VM" #define CONFIG_USBD_PRODUCT_NAME "DM365VM"
#endif /* CONFIG_MUSB_UDC */ #endif /* CONFIG_USB_MUSB_UDC */
/* U-Boot command configuration */ /* U-Boot command configuration */
#define CONFIG_CMD_ASKENV #define CONFIG_CMD_ASKENV

4
include/configs/davinci_dvevm.h
View file

@ -156,7 +156,7 @@
#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_LONGHELP
#define CONFIG_CRC32_VERIFY #define CONFIG_CRC32_VERIFY
#define CONFIG_MX_CYCLIC #define CONFIG_MX_CYCLIC
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
#define CONFIG_USB_DAVINCI #define CONFIG_USB_DAVINCI
/*===================*/ /*===================*/
/* Linux Information */ /* Linux Information */
@ -194,7 +194,7 @@
/*==========================*/ /*==========================*/
#ifdef CONFIG_USB_DAVINCI #ifdef CONFIG_USB_DAVINCI
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#ifdef CONFIG_MUSB_HCD #ifdef CONFIG_USB_MUSB_HCD
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_CMD_STORAGE #define CONFIG_CMD_STORAGE
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT

10
include/configs/kwb.h
View file

@ -116,20 +116,20 @@ BUR_COMMON_ENV \
/* USB configuration */ /* USB configuration */
#define CONFIG_USB_MUSB_DSPS #define CONFIG_USB_MUSB_DSPS
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
/* attention! not only for gadget, enables also highspeed in hostmode */ /* attention! not only for gadget, enables also highspeed in hostmode */
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB0_MODE MUSB_HOST
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST #define CONFIG_AM335X_USB1_MODE MUSB_HOST
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif /* CONFIG_MUSB_HOST */ #endif /* CONFIG_USB_MUSB_HOST */
#undef CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_IS_IN_MMC

4
include/configs/nokia_rx51.h
View file

@ -108,8 +108,8 @@
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
/* USB */ /* USB */
#define CONFIG_MUSB_UDC #define CONFIG_USB_MUSB_UDC
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
#define CONFIG_USB_OMAP3 #define CONFIG_USB_OMAP3
#define CONFIG_TWL4030_USB #define CONFIG_TWL4030_USB

4
include/configs/omap3_beagle.h
View file

@ -59,9 +59,9 @@
#define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}} #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}}
/* USB */ /* USB */
#define CONFIG_MUSB_GADGET #define CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_USB_MUSB_OMAP2PLUS
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_TWL4030_USB 1 #define CONFIG_TWL4030_USB 1
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER

8
include/configs/omap3_evm.h
View file

@ -77,12 +77,12 @@
/* USB /* USB
* *
* Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard * Enable CONFIG_USB_MUSB_HCD for Host functionalities MSC, keyboard
* Enable CONFIG_MUSB_UDD for Device functionalities. * Enable CONFIG_USB_MUSB_UDD for Device functionalities.
*/ */
#define CONFIG_USB_OMAP3 #define CONFIG_USB_OMAP3
#define CONFIG_MUSB_HCD #define CONFIG_USB_MUSB_HCD
/* #define CONFIG_MUSB_UDC */ /* #define CONFIG_USB_MUSB_UDC */
/* NAND SPL */ /* NAND SPL */
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE

8
include/configs/omap3_evm_common.h
View file

@ -146,7 +146,7 @@
*/ */
#ifdef CONFIG_USB_OMAP3 #ifdef CONFIG_USB_OMAP3
#ifdef CONFIG_MUSB_HCD #ifdef CONFIG_USB_MUSB_HCD
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
@ -158,9 +158,9 @@
#define CONFIG_PREBOOT "usb start" #define CONFIG_PREBOOT "usb start"
#endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_USB_KEYBOARD */
#endif /* CONFIG_MUSB_HCD */ #endif /* CONFIG_USB_MUSB_HCD */
#ifdef CONFIG_MUSB_UDC #ifdef CONFIG_USB_MUSB_UDC
/* USB device configuration */ /* USB device configuration */
#define CONFIG_USB_DEVICE #define CONFIG_USB_DEVICE
#define CONFIG_USB_TTY #define CONFIG_USB_TTY
@ -171,7 +171,7 @@
#define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_PRODUCTID 0x5678
#define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_MANUFACTURER "Texas Instruments"
#define CONFIG_USBD_PRODUCT_NAME "EVM" #define CONFIG_USBD_PRODUCT_NAME "EVM"
#endif /* CONFIG_MUSB_UDC */ #endif /* CONFIG_USB_MUSB_UDC */
#endif /* CONFIG_USB_OMAP3 */ #endif /* CONFIG_USB_OMAP3 */

2
include/configs/omap3_igep00x0.h
View file

@ -54,7 +54,7 @@
#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ #define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */
/* USB */ /* USB */
#define CONFIG_MUSB_UDC 1 #define CONFIG_USB_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1 #define CONFIG_USB_OMAP3 1
#define CONFIG_TWL4030_USB 1 #define CONFIG_TWL4030_USB 1

2
include/configs/omap3_mvblx.h
View file

@ -94,7 +94,7 @@
#define CONFIG_SILENT_CONSOLE 1 #define CONFIG_SILENT_CONSOLE 1
/* USB */ /* USB */
#define CONFIG_MUSB_UDC 1 #define CONFIG_USB_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1 #define CONFIG_USB_OMAP3 1
#define CONFIG_TWL4030_USB 1 #define CONFIG_TWL4030_USB 1

2
include/configs/omap3_zoom1.h
View file

@ -49,7 +49,7 @@
*/ */
/* USB */ /* USB */
#define CONFIG_MUSB_UDC 1 #define CONFIG_USB_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1 #define CONFIG_USB_OMAP3 1
#define CONFIG_TWL4030_USB 1 #define CONFIG_TWL4030_USB 1

12
include/configs/pcm051.h
View file

@ -143,24 +143,24 @@
*/ */
#define CONFIG_USB_MUSB_DSPS #define CONFIG_USB_MUSB_DSPS
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_MUSB_GADGET #define CONFIG_USB_MUSB_GADGET
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST #define CONFIG_AM335X_USB1_MODE MUSB_HOST
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif #endif
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#endif /* CONFIG_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
#define CONFIG_PHY_GIGE #define CONFIG_PHY_GIGE
#define CONFIG_PHYLIB #define CONFIG_PHYLIB

12
include/configs/pengwyn.h
View file

@ -174,26 +174,26 @@
*/ */
#define CONFIG_USB_MUSB_DSPS #define CONFIG_USB_MUSB_DSPS
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_MUSB_GADGET #define CONFIG_USB_MUSB_GADGET
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
#define CONFIG_USB_GADGET #define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST #define CONFIG_AM335X_USB1_MODE MUSB_HOST
#if defined(CONFIG_MUSB_HOST) #if defined(CONFIG_USB_MUSB_HOST)
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif #endif
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_SPL_BUILD)
/* disable host part of MUSB in SPL */ /* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST #undef CONFIG_USB_MUSB_HOST
/* Disable CPSW SPL support so we fit within the 101KiB limit. */ /* Disable CPSW SPL support so we fit within the 101KiB limit. */
#undef CONFIG_SPL_ETH_SUPPORT #undef CONFIG_SPL_ETH_SUPPORT
#endif #endif

14
include/configs/siemens-am33x-common.h
View file

@ -226,27 +226,27 @@
*/ */
#define CONFIG_USB_MUSB_DSPS #define CONFIG_USB_MUSB_DSPS
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_MUSB_GADGET #define CONFIG_USB_MUSB_GADGET
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
#undef CONFIG_USB_GADGET_DUALSPEED #undef CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST #define CONFIG_AM335X_USB1_MODE MUSB_HOST
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif #endif
#ifdef CONFIG_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#endif /* CONFIG_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
#define CONFIG_USB_GADGET #define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DOWNLOAD

4
include/configs/sunxi-common.h
View file

@ -326,8 +326,8 @@ extern int soft_i2c_gpio_scl;
#endif #endif
#ifdef CONFIG_USB_MUSB_SUNXI #ifdef CONFIG_USB_MUSB_SUNXI
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#endif #endif
#ifdef CONFIG_USB_KEYBOARD #ifdef CONFIG_USB_KEYBOARD

2
include/configs/ti_omap4_common.h
View file

@ -70,7 +70,7 @@
#endif #endif
/* USB */ /* USB */
#define CONFIG_MUSB_UDC 1 #define CONFIG_USB_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1 #define CONFIG_USB_OMAP3 1
/* USB device configuration */ /* USB device configuration */

10
include/configs/tseries.h
View file

@ -245,20 +245,20 @@ MMCARGS
/* USB configuration */ /* USB configuration */
#define CONFIG_USB_MUSB_DSPS #define CONFIG_USB_MUSB_DSPS
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
/* attention! not only for gadget, enables also highspeed in hostmode */ /* attention! not only for gadget, enables also highspeed in hostmode */
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_MUSB_HOST #define CONFIG_USB_MUSB_HOST
#define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB0_MODE MUSB_HOST
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST #define CONFIG_AM335X_USB1_MODE MUSB_HOST
#ifdef CONFIG_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif /* CONFIG_MUSB_HOST */ #endif /* CONFIG_USB_MUSB_HOST */
#if defined(CONFIG_SPI_BOOT) #if defined(CONFIG_SPI_BOOT)
/* McSPI IP block */ /* McSPI IP block */

4
include/usb.h
View file

@ -174,7 +174,7 @@ enum usb_init_type {
int usb_lowlevel_init(int index, enum usb_init_type init, void **controller); int usb_lowlevel_init(int index, enum usb_init_type init, void **controller);
int usb_lowlevel_stop(int index); int usb_lowlevel_stop(int index);
#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_DM_USB) #if defined(CONFIG_USB_MUSB_HOST) || defined(CONFIG_DM_USB)
int usb_reset_root_port(struct usb_device *dev); int usb_reset_root_port(struct usb_device *dev);
#else #else
#define usb_reset_root_port(dev) #define usb_reset_root_port(dev)
@ -187,7 +187,7 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
int transfer_len, int interval); int transfer_len, int interval);
#if defined CONFIG_USB_EHCI || defined CONFIG_MUSB_HOST || defined(CONFIG_DM_USB) #if defined CONFIG_USB_EHCI || defined CONFIG_USB_MUSB_HOST || defined(CONFIG_DM_USB)
struct int_queue *create_int_queue(struct usb_device *dev, unsigned long pipe, struct int_queue *create_int_queue(struct usb_device *dev, unsigned long pipe,
int queuesize, int elementsize, void *buffer, int interval); int queuesize, int elementsize, void *buffer, int interval);
int destroy_int_queue(struct usb_device *dev, struct int_queue *queue); int destroy_int_queue(struct usb_device *dev, struct int_queue *queue);