From 95de1e2f26b562156210833ff667be6d071de019 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 4 Aug 2015 17:04:06 +0200 Subject: [PATCH] usb: musb-new: CONFIG_MUSB prefix replacement with CONFIG_USB_MUSB 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 --- arch/arm/cpu/armv7/am33xx/board.c | 2 +- arch/arm/include/asm/arch-sunxi/usb_phy.h | 2 +- board/birdland/bav335x/board.c | 2 +- board/compulab/cm_t3517/cm_t3517.c | 6 +++--- board/logicpd/am3517evm/am3517evm.c | 8 ++++---- board/phytec/pcm051/board.c | 2 +- board/siemens/draco/board.c | 2 +- board/siemens/pxm2/board.c | 2 +- board/siemens/rut/board.c | 2 +- board/ti/am335x/board.c | 2 +- board/ti/beagle/beagle.c | 8 ++++---- board/vscom/baltos/board.c | 2 +- drivers/usb/gadget/gadget_chips.h | 2 +- drivers/usb/musb-new/Makefile | 6 +++--- drivers/usb/musb-new/musb_core.c | 12 ++++++------ drivers/usb/musb-new/musb_core.h | 4 ++-- drivers/usb/musb-new/musb_dma.h | 2 +- drivers/usb/musb-new/musb_gadget.c | 4 ++-- drivers/usb/musb-new/musb_uboot.c | 12 ++++++------ drivers/usb/musb-new/sunxi.c | 6 +++--- drivers/usb/musb/Makefile | 4 ++-- drivers/usb/musb/musb_core.c | 8 ++++---- drivers/usb/musb/musb_hcd.c | 6 +++--- drivers/usb/musb/musb_hcd.h | 4 ++-- include/configs/am335x_evm.h | 16 ++++++++-------- include/configs/am3517_crane.h | 14 +++++++------- include/configs/am3517_evm.h | 16 ++++++++-------- include/configs/baltos.h | 16 ++++++++-------- include/configs/bav335x.h | 16 ++++++++-------- include/configs/bf526-ezbrd.h | 4 ++-- include/configs/bf527-ezkit.h | 4 ++-- include/configs/bf548-ezkit.h | 4 ++-- include/configs/cam_enc_4xx.h | 2 +- include/configs/cm_t35.h | 2 +- include/configs/cm_t3517.h | 4 ++-- include/configs/da830evm.h | 10 +++++----- include/configs/davinci_dm355evm.h | 4 ++-- include/configs/davinci_dm365evm.h | 10 +++++----- include/configs/davinci_dvevm.h | 4 ++-- include/configs/kwb.h | 10 +++++----- include/configs/nokia_rx51.h | 4 ++-- include/configs/omap3_beagle.h | 4 ++-- include/configs/omap3_evm.h | 8 ++++---- include/configs/omap3_evm_common.h | 8 ++++---- include/configs/omap3_igep00x0.h | 2 +- include/configs/omap3_mvblx.h | 2 +- include/configs/omap3_zoom1.h | 2 +- include/configs/pcm051.h | 12 ++++++------ include/configs/pengwyn.h | 12 ++++++------ include/configs/siemens-am33x-common.h | 14 +++++++------- include/configs/sunxi-common.h | 4 ++-- include/configs/ti_omap4_common.h | 2 +- include/configs/tseries.h | 10 +++++----- include/usb.h | 4 ++-- 54 files changed, 167 insertions(+), 167 deletions(-) diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index 67bef23ea9..377c611eb6 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -124,7 +124,7 @@ int cpu_mmc_init(bd_t *bis) #endif /* 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)) static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; diff --git a/arch/arm/include/asm/arch-sunxi/usb_phy.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h index 17d31b8e31..cef6c985bc 100644 --- a/arch/arm/include/asm/arch-sunxi/usb_phy.h +++ b/arch/arm/include/asm/arch-sunxi/usb_phy.h @@ -21,7 +21,7 @@ int sunxi_usb_phy_id_detect(int index); void sunxi_usb_phy_enable_squelch_detect(int index, int enable); /* 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); #else #define sunxi_musb_board_init() diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c index 32ff7a4f9e..67aca3cc43 100644 --- a/board/birdland/bav335x/board.c +++ b/board/birdland/bav335x/board.c @@ -363,7 +363,7 @@ static struct cpsw_platform_data cpsw_data = { #if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\ defined(CONFIG_SPL_BUILD)) || \ ((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)) int board_eth_init(bd_t *bis) { diff --git a/board/compulab/cm_t3517/cm_t3517.c b/board/compulab/cm_t3517/cm_t3517.c index 03b2badd02..b33522ec8b 100644 --- a/board/compulab/cm_t3517/cm_t3517.c +++ b/board/compulab/cm_t3517/cm_t3517.c @@ -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 = { -#if defined(CONFIG_MUSB_HOST) +#if defined(CONFIG_USB_MUSB_HOST) .mode = MUSB_HOST, -#elif defined(CONFIG_MUSB_GADGET) +#elif defined(CONFIG_USB_MUSB_GADGET) .mode = MUSB_PERIPHERAL, #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 .config = &cm_t3517_musb_config, .power = 250, diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index 24be6eabfc..24ff9c36a1 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -65,12 +65,12 @@ static struct omap_musb_board_data musb_board_data = { }; static struct musb_hdrc_platform_data musb_plat = { -#if defined(CONFIG_MUSB_HOST) +#if defined(CONFIG_USB_MUSB_HOST) .mode = MUSB_HOST, -#elif defined(CONFIG_MUSB_GADGET) +#elif defined(CONFIG_USB_MUSB_GADGET) .mode = MUSB_PERIPHERAL, #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 .config = &musb_config, .power = 250, @@ -159,7 +159,7 @@ int board_mmc_init(bd_t *bis) } #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 rv, n = 0; diff --git a/board/phytec/pcm051/board.c b/board/phytec/pcm051/board.c index 1bf9d730e5..4f3853ac42 100644 --- a/board/phytec/pcm051/board.c +++ b/board/phytec/pcm051/board.c @@ -208,7 +208,7 @@ static struct cpsw_platform_data cpsw_data = { #endif #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 rv, n = 0; diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c index 2697762076..48823141da 100644 --- a/board/siemens/draco/board.c +++ b/board/siemens/draco/board.c @@ -267,7 +267,7 @@ static struct cpsw_platform_data cpsw_data = { }; #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) { struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c index 4d8ba3cd80..750f338897 100644 --- a/board/siemens/pxm2/board.c +++ b/board/siemens/pxm2/board.c @@ -213,7 +213,7 @@ static struct cpsw_platform_data cpsw_data = { #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */ #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 n = 0; diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index fb840f7ed2..f94e3e5736 100644 --- a/board/siemens/rut/board.c +++ b/board/siemens/rut/board.c @@ -174,7 +174,7 @@ static struct cpsw_platform_data cpsw_data = { }; #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) { struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 96245a3306..1dc2ed0cf4 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -569,7 +569,7 @@ static struct cpsw_platform_data cpsw_data = { #if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ && defined(CONFIG_SPL_BUILD)) || \ ((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)) int board_eth_init(bd_t *bis) { diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 7b37fbe299..3b0a9e7141 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -306,12 +306,12 @@ static struct omap_musb_board_data musb_board_data = { }; static struct musb_hdrc_platform_data musb_plat = { -#if defined(CONFIG_MUSB_HOST) +#if defined(CONFIG_USB_MUSB_HOST) .mode = MUSB_HOST, -#elif defined(CONFIG_MUSB_GADGET) +#elif defined(CONFIG_USB_MUSB_GADGET) .mode = MUSB_PERIPHERAL, #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 .config = &musb_config, .power = 100, @@ -568,7 +568,7 @@ int ehci_hcd_stop(int index) #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) { return usb_eth_initialize(bis); diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index 09bc8c682a..638d14f6d0 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -407,7 +407,7 @@ static struct cpsw_platform_data cpsw_data = { #if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ && defined(CONFIG_SPL_BUILD)) || \ ((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)) int board_eth_init(bd_t *bis) { diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h index c859df2f7f..e9811c3864 100644 --- a/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h @@ -125,7 +125,7 @@ #endif /* 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)) #else #define gadget_is_musbhdrc(g) 0 diff --git a/drivers/usb/musb-new/Makefile b/drivers/usb/musb-new/Makefile index 9edeece381..fd9df72ed4 100644 --- a/drivers/usb/musb-new/Makefile +++ b/drivers/usb/musb-new/Makefile @@ -2,9 +2,9 @@ # 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_MUSB_GADGET) += musb_uboot.o -obj-$(CONFIG_MUSB_HOST) += musb_host.o musb_core.o musb_uboot.o +obj-$(CONFIG_USB_MUSB_GADGET) += musb_gadget.o musb_gadget_ep0.o musb_core.o +obj-$(CONFIG_USB_MUSB_GADGET) += 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_AM35X) += am35x.o obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index f530af4fb7..411e5a0884 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -1437,7 +1437,7 @@ static int __devinit musb_core_init(u16 musb_type, struct musb *musb) strcat(aInfo, ", dyn FIFOs"); musb->dyn_fifo = true; } -#ifndef CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#ifndef CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT if (reg & MUSB_CONFIGDATA_MPRXE) { strcat(aInfo, ", bulk combine"); musb->bulk_combine = true; @@ -1662,7 +1662,7 @@ irqreturn_t musb_interrupt(struct musb *musb) } EXPORT_SYMBOL_GPL(musb_interrupt); -#ifndef CONFIG_MUSB_PIO_ONLY +#ifndef CONFIG_USB_MUSB_PIO_ONLY static bool __devinitdata use_dma = 1; /* "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); -#ifndef CONFIG_MUSB_PIO_ONLY +#ifndef CONFIG_USB_MUSB_PIO_ONLY if (use_dma && dev->dma_mask) { struct dma_controller *c; @@ -2194,7 +2194,7 @@ fail0: * 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; #endif @@ -2217,7 +2217,7 @@ static int __devinit musb_probe(struct platform_device *pdev) return -ENOMEM; } -#ifndef CONFIG_MUSB_PIO_ONLY +#ifndef CONFIG_USB_MUSB_PIO_ONLY /* clobbered by use_dma=n */ orig_dma_mask = dev->dma_mask; #endif @@ -2244,7 +2244,7 @@ static int __devexit musb_remove(struct platform_device *pdev) musb_free(musb); iounmap(ctrl_base); device_init_wakeup(&pdev->dev, 0); -#ifndef CONFIG_MUSB_PIO_ONLY +#ifndef CONFIG_USB_MUSB_PIO_ONLY pdev->dev.dma_mask = orig_dma_mask; #endif return 0; diff --git a/drivers/usb/musb-new/musb_core.h b/drivers/usb/musb-new/musb_core.h index 8727f6415e..c818040481 100644 --- a/drivers/usb/musb-new/musb_core.h +++ b/drivers/usb/musb-new/musb_core.h @@ -97,7 +97,7 @@ struct musb_ep; #ifndef __UBOOT__ #define is_peripheral_capable() (1) #else -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define is_peripheral_capable() (1) #else #define is_peripheral_capable() (0) @@ -118,7 +118,7 @@ extern void musb_g_disconnect(struct musb *); #ifndef __UBOOT__ #define is_host_capable() (1) #else -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define is_host_capable() (1) #else #define is_host_capable() (0) diff --git a/drivers/usb/musb-new/musb_dma.h b/drivers/usb/musb-new/musb_dma.h index 3a97c4e2d4..17fe89fdcb 100644 --- a/drivers/usb/musb-new/musb_dma.h +++ b/drivers/usb/musb-new/musb_dma.h @@ -62,7 +62,7 @@ struct musb_hw_ep; #define DMA_ADDR_INVALID (~(dma_addr_t)0) -#ifndef CONFIG_MUSB_PIO_ONLY +#ifndef CONFIG_USB_MUSB_PIO_ONLY #define is_dma_capable() (1) #else #define is_dma_capable() (0) diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c index 97acf93d31..309dc7f93f 100644 --- a/drivers/usb/musb-new/musb_gadget.c +++ b/drivers/usb/musb-new/musb_gadget.c @@ -99,7 +99,7 @@ #define is_buffer_mapped(req) (is_dma_capable() && \ (req->map_state != UN_MAPPED)) -#ifndef CONFIG_MUSB_PIO_ONLY +#ifndef CONFIG_USB_MUSB_PIO_ONLY /* Maps the buffer to dma */ 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, csr); -#ifndef CONFIG_MUSB_PIO_ONLY +#ifndef CONFIG_USB_MUSB_PIO_ONLY if (is_buffer_mapped(req)) { struct dma_controller *c = musb->dma_controller; size_t request_size; diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index 9b56e904e4..10f6b5d1cf 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -15,7 +15,7 @@ #include "musb_gadget.h" #include "musb_uboot.h" -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST struct int_queue { struct usb_host_endpoint hep; struct urb urb; @@ -368,9 +368,9 @@ struct dm_usb_ops musb_usb_ops = { .reset_root_port = musb_reset_root_port, }; #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; 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); return 0; } -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ int musb_register(struct musb_hdrc_platform_data *plat, void *bdata, void *ctl_regs) @@ -428,12 +428,12 @@ int musb_register(struct musb_hdrc_platform_data *plat, void *bdata, struct musb **musbp; 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: musbp = &musb_host.host; break; #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET case MUSB_PERIPHERAL: musbp = &gadget; break; diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 3a29b18e5f..85ac28dfd9 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -286,7 +286,7 @@ static struct musb_hdrc_config musb_config = { }; static struct musb_hdrc_platform_data musb_plat = { -#if defined(CONFIG_MUSB_HOST) +#if defined(CONFIG_USB_MUSB_HOST) .mode = MUSB_HOST, #else .mode = MUSB_PERIPHERAL, @@ -296,7 +296,7 @@ static struct musb_hdrc_platform_data musb_plat = { .platform_ops = &sunxi_musb_ops, }; -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST int musb_usb_probe(struct udevice *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) { -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST struct udevice *dev; /* diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index 3c9ed98bc0..bd2b7c521f 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile @@ -5,8 +5,8 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_MUSB_HCD) += musb_hcd.o musb_core.o -obj-$(CONFIG_MUSB_UDC) += musb_udc.o musb_core.o +obj-$(CONFIG_USB_MUSB_HCD) += musb_hcd.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_DAVINCI) += davinci.o obj-$(CONFIG_USB_OMAP3) += omap3.o diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 786909fb60..ea3996a555 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -19,7 +19,7 @@ struct musb_regs *musbr; */ void musb_start(void) { -#if defined(CONFIG_MUSB_HCD) +#if defined(CONFIG_USB_MUSB_HCD) u8 devctl; u8 busctl; #endif @@ -32,7 +32,7 @@ void musb_start(void) /* put into basic highspeed mode and start session */ 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 */ if (musb_cfg.extvbus == 1) { 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); csr = readw(&musbr->txcsr); -#if defined(CONFIG_MUSB_HCD) +#if defined(CONFIG_USB_MUSB_HCD) /* clear the data toggle bit */ writew(csr | MUSB_TXCSR_CLRDATATOG, &musbr->txcsr); #endif @@ -94,7 +94,7 @@ void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt) config_fifo(rx, idx, fifoaddr); csr = readw(&musbr->rxcsr); -#if defined(CONFIG_MUSB_HCD) +#if defined(CONFIG_USB_MUSB_HCD) /* clear the data toggle bit */ writew(csr | MUSB_RXCSR_CLRDATATOG, &musbr->rxcsr); #endif diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c index f0ba8aaaa3..9a3b61aa55 100644 --- a/drivers/usb/musb/musb_hcd.c +++ b/drivers/usb/musb/musb_hcd.c @@ -117,7 +117,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask) { u16 csr; int result = 1; - int timeout = CONFIG_MUSB_TIMEOUT; + int timeout = CONFIG_USB_MUSB_TIMEOUT; while (result > 0) { 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) { u16 csr; - int timeout = CONFIG_MUSB_TIMEOUT; + int timeout = CONFIG_USB_MUSB_TIMEOUT; do { 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) { u16 csr; - int timeout = CONFIG_MUSB_TIMEOUT; + int timeout = CONFIG_USB_MUSB_TIMEOUT; do { if (check_stall(ep, 0)) { diff --git a/drivers/usb/musb/musb_hcd.h b/drivers/usb/musb/musb_hcd.h index 0c8e75d46c..831957d9f9 100644 --- a/drivers/usb/musb/musb_hcd.h +++ b/drivers/usb/musb/musb_hcd.h @@ -17,8 +17,8 @@ extern unsigned char new[]; #endif -#ifndef CONFIG_MUSB_TIMEOUT -# define CONFIG_MUSB_TIMEOUT 100000 +#ifndef CONFIG_USB_MUSB_TIMEOUT +# define CONFIG_USB_MUSB_TIMEOUT 100000 #endif /* This defines the endpoint number used for control transfers */ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 633391bc93..e89c49e1e3 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -283,14 +283,14 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 @@ -309,12 +309,12 @@ #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #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_PRODUCT_NUM 0xD022 #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) /* Remove other SPL modes. */ @@ -333,7 +333,7 @@ #define CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ -#undef CONFIG_MUSB_HOST +#undef CONFIG_USB_MUSB_HOST /* disable EFI partitions and partition UUID support */ #undef CONFIG_PARTITION_UUIDS #undef CONFIG_EFI_PARTITION diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 6a0240b903..600fefbc20 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -91,15 +91,15 @@ /* * USB configuration - * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard - * Enable CONFIG_MUSB_UDC for Device functionalities. + * Enable CONFIG_USB_MUSB_HCD for Host functionalities MSC, keyboard + * Enable CONFIG_USB_MUSB_UDC for Device functionalities. */ #define CONFIG_USB_AM35X 1 -#define CONFIG_MUSB_HCD 1 +#define CONFIG_USB_MUSB_HCD 1 #ifdef CONFIG_USB_AM35X -#ifdef CONFIG_MUSB_HCD +#ifdef CONFIG_USB_MUSB_HCD #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE @@ -111,9 +111,9 @@ #define CONFIG_PREBOOT "usb start" #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 */ #define CONFIG_USB_DEVICE 1 #define CONFIG_USB_TTY 1 @@ -123,7 +123,7 @@ #define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "AM3517CRANE" -#endif /* CONFIG_MUSB_UDC */ +#endif /* CONFIG_USB_MUSB_UDC */ #endif /* CONFIG_USB_AM35X */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index e9808a7473..30f31a93ad 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -97,16 +97,16 @@ /* * USB configuration - * Enable CONFIG_MUSB_HOST for Host functionalities MSC, keyboard - * Enable CONFIG_MUSB_GADGET for Device functionalities. + * Enable CONFIG_USB_MUSB_HOST for Host functionalities MSC, keyboard + * Enable CONFIG_USB_MUSB_GADGET for Device functionalities. */ #define CONFIG_USB_MUSB_AM35X -#define CONFIG_MUSB_HOST -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_HOST +#define CONFIG_USB_MUSB_PIO_ONLY #ifdef CONFIG_USB_MUSB_AM35X -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE @@ -118,13 +118,13 @@ #define CONFIG_PREBOOT "usb start" #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_ETHER #define CONFIG_USB_ETH_RNDIS -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_AM35X */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index cce5e4f285..5545cf0f10 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -273,25 +273,25 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET #define CONFIG_USBDOWNLOAD_GADGET #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_OTG -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #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_PRODUCT_NUM 0xBD00 #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) /* disable host part of MUSB in SPL */ -#undef CONFIG_MUSB_HOST +#undef CONFIG_USB_MUSB_HOST /* disable EFI partitions and partition UUID support */ #undef CONFIG_PARTITION_UUIDS #undef CONFIG_EFI_PARTITION diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index fa32fa43d1..9917627fc0 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -440,14 +440,14 @@ DEFAULT_LINUX_BOOT_ENV \ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 @@ -466,12 +466,12 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_CMD_USB_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_PRODUCT_NUM 0xD022 #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) /* disable host part of MUSB in SPL */ -#undef CONFIG_MUSB_HOST +#undef CONFIG_USB_MUSB_HOST /* disable EFI partitions and partition UUID support */ #undef CONFIG_PARTITION_UUIDS #undef CONFIG_EFI_PARTITION diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index 5767ac1bd7..a8f0979624 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -136,10 +136,10 @@ */ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) #define CONFIG_USB -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN #define CONFIG_USB_STORAGE -#define CONFIG_MUSB_TIMEOUT 100000 +#define CONFIG_USB_MUSB_TIMEOUT 100000 #endif diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 28b3760f69..d23602bb32 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -139,10 +139,10 @@ */ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) #define CONFIG_USB -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN #define CONFIG_USB_STORAGE -#define CONFIG_MUSB_TIMEOUT 100000 +#define CONFIG_USB_MUSB_TIMEOUT 100000 #endif /* Don't waste time transferring a logo over the UART */ diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index c7b44ae427..f0f768ac09 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -163,10 +163,10 @@ */ #if !defined(__ADSPBF544__) #define CONFIG_USB -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN #define CONFIG_USB_STORAGE -#define CONFIG_MUSB_TIMEOUT 100000 +#define CONFIG_USB_MUSB_TIMEOUT 100000 #endif diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index 21e3a0c2db..3400dd46f9 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -488,7 +488,7 @@ /* USB Configuration */ #define CONFIG_USB_DAVINCI -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN | \ USBPHY_PHY24MHZ) diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 41df106ee0..6885ae1e36 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -100,7 +100,7 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_STORAGE -#define CONFIG_MUSB_UDC +#define CONFIG_USB_MUSB_UDC #define CONFIG_TWL4030_USB #define CONFIG_CMD_USB diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index a8d0b97287..cf0841499b 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -112,8 +112,8 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147 #else /* !CONFIG_USB_MUSB_AM35X */ -#define CONFIG_MUSB_HOST -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_HOST +#define CONFIG_USB_MUSB_PIO_ONLY #endif /* CONFIG_USB_MUSB_AM35X */ #define CONFIG_USB_STORAGE diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h index 729b6e74aa..b82140e939 100644 --- a/include/configs/da830evm.h +++ b/include/configs/da830evm.h @@ -135,7 +135,7 @@ * USB configuration */ #define CONFIG_USB_DA8XX /* Platform hookup to MUSB controller */ -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD /* * U-Boot general configuration @@ -233,7 +233,7 @@ #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_USB_STORAGE /* MSC class support */ @@ -244,9 +244,9 @@ #define CONFIG_PREBOOT "usb start" #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 */ #define CONFIG_USB_DEVICE 1 #define CONFIG_USB_TTY 1 @@ -256,7 +256,7 @@ #define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "DA830EVM" -#endif /* CONFIG_MUSB_UDC */ +#endif /* CONFIG_USB_MUSB_UDC */ #endif /* CONFIG_USB_DA8XX */ diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h index 847d788292..e873fa4d8d 100644 --- a/include/configs/davinci_dm355evm.h +++ b/include/configs/davinci_dm355evm.h @@ -96,11 +96,11 @@ #endif #ifdef CONFIG_USB_DAVINCI -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #else -#undef CONFIG_MUSB_HCD +#undef CONFIG_USB_MUSB_HCD #undef CONFIG_CMD_USB #undef CONFIG_USB_STORAGE #endif diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index 8b42c50dd9..9bdd2d6611 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -78,7 +78,7 @@ /* USB Configuration */ #define CONFIG_USB_DAVINCI -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #ifdef CONFIG_USB_DAVINCI #define CONFIG_CMD_USB /* include support for usb */ @@ -87,7 +87,7 @@ #define CONFIG_DOS_PARTITION /* include support for FAT/storage*/ #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_USB_STORAGE /* MSC class support */ #define CONFIG_CMD_STORAGE /* inclue support for usb-storage cmd */ @@ -99,9 +99,9 @@ #define CONFIG_PREBOOT "usb start" #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_TTY 1 #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 @@ -109,7 +109,7 @@ #define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "DM365VM" -#endif /* CONFIG_MUSB_UDC */ +#endif /* CONFIG_USB_MUSB_UDC */ /* U-Boot command configuration */ #define CONFIG_CMD_ASKENV diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index 61087363b2..35e9a15a9d 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -156,7 +156,7 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY #define CONFIG_MX_CYCLIC -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_DAVINCI /*===================*/ /* Linux Information */ @@ -194,7 +194,7 @@ /*==========================*/ #ifdef CONFIG_USB_DAVINCI #define CONFIG_CMD_USB -#ifdef CONFIG_MUSB_HCD +#ifdef CONFIG_USB_MUSB_HCD #define CONFIG_USB_STORAGE #define CONFIG_CMD_STORAGE #define CONFIG_CMD_FAT diff --git a/include/configs/kwb.h b/include/configs/kwb.h index acff5b9f89..96f2e9d39b 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -116,20 +116,20 @@ BUR_COMMON_ENV \ /* USB configuration */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT /* attention! not only for gadget, enables also highspeed in hostmode */ #define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE -#endif /* CONFIG_MUSB_HOST */ +#endif /* CONFIG_USB_MUSB_HOST */ #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 6e3ce4d3c7..7ec9965a46 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -108,8 +108,8 @@ #define CONFIG_DOS_PARTITION /* USB */ -#define CONFIG_MUSB_UDC -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_UDC +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_OMAP3 #define CONFIG_TWL4030_USB diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 804e30708f..dbe3e9be8c 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -59,9 +59,9 @@ #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}} /* USB */ -#define CONFIG_MUSB_GADGET +#define CONFIG_USB_MUSB_GADGET #define CONFIG_USB_MUSB_OMAP2PLUS -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_TWL4030_USB 1 #define CONFIG_USB_ETHER diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 70fab4b0f4..1dd71a8eb6 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -77,12 +77,12 @@ /* USB * - * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard - * Enable CONFIG_MUSB_UDD for Device functionalities. + * Enable CONFIG_USB_MUSB_HCD for Host functionalities MSC, keyboard + * Enable CONFIG_USB_MUSB_UDD for Device functionalities. */ #define CONFIG_USB_OMAP3 -#define CONFIG_MUSB_HCD -/* #define CONFIG_MUSB_UDC */ +#define CONFIG_USB_MUSB_HCD +/* #define CONFIG_USB_MUSB_UDC */ /* NAND SPL */ #define CONFIG_SPL_NAND_SIMPLE diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 370f21e3ee..66c314fc42 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -146,7 +146,7 @@ */ #ifdef CONFIG_USB_OMAP3 -#ifdef CONFIG_MUSB_HCD +#ifdef CONFIG_USB_MUSB_HCD #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE @@ -158,9 +158,9 @@ #define CONFIG_PREBOOT "usb start" #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 */ #define CONFIG_USB_DEVICE #define CONFIG_USB_TTY @@ -171,7 +171,7 @@ #define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "EVM" -#endif /* CONFIG_MUSB_UDC */ +#endif /* CONFIG_USB_MUSB_UDC */ #endif /* CONFIG_USB_OMAP3 */ diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 89ec73cc36..8785d8fd50 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -54,7 +54,7 @@ #define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ /* USB */ -#define CONFIG_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 #define CONFIG_TWL4030_USB 1 diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 4339b0558c..19543a12b2 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -94,7 +94,7 @@ #define CONFIG_SILENT_CONSOLE 1 /* USB */ -#define CONFIG_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 #define CONFIG_TWL4030_USB 1 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index d90cc42d93..2d1d53dc38 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -49,7 +49,7 @@ */ /* USB */ -#define CONFIG_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 #define CONFIG_TWL4030_USB 1 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index d80cf32cbe..275e952fb2 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -143,24 +143,24 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ #define CONFIG_PHY_GIGE #define CONFIG_PHYLIB diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 4684ad6852..ccb5dd3c03 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -174,26 +174,26 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#if defined(CONFIG_MUSB_HOST) +#if defined(CONFIG_USB_MUSB_HOST) #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif #if defined(CONFIG_SPL_BUILD) /* 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. */ #undef CONFIG_SPL_ETH_SUPPORT #endif diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index f7bef706eb..08235c7445 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -226,27 +226,27 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #undef CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #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_DOWNLOAD diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 5adcc39e02..c002342034 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -326,8 +326,8 @@ extern int soft_i2c_gpio_scl; #endif #ifdef CONFIG_USB_MUSB_SUNXI -#define CONFIG_MUSB_HOST -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_HOST +#define CONFIG_USB_MUSB_PIO_ONLY #endif #ifdef CONFIG_USB_KEYBOARD diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index b299aedb2e..2eaa3b61b4 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -70,7 +70,7 @@ #endif /* USB */ -#define CONFIG_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 /* USB device configuration */ diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 6a1835efe6..4265b8a4ff 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -245,20 +245,20 @@ MMCARGS /* USB configuration */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT /* attention! not only for gadget, enables also highspeed in hostmode */ #define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE -#endif /* CONFIG_MUSB_HOST */ +#endif /* CONFIG_USB_MUSB_HOST */ #if defined(CONFIG_SPI_BOOT) /* McSPI IP block */ diff --git a/include/usb.h b/include/usb.h index cf00ffdf53..88ebbe6e3f 100644 --- a/include/usb.h +++ b/include/usb.h @@ -174,7 +174,7 @@ enum usb_init_type { int usb_lowlevel_init(int index, enum usb_init_type init, void **controller); 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); #else #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 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, int queuesize, int elementsize, void *buffer, int interval); int destroy_int_queue(struct usb_device *dev, struct int_queue *queue); -- 2.30.2