[U-Boot] [PATCH 14/17] Kconfig: USB: Migrate CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCD

In order to be able to migrate the various SoC EHCI CONFIG options we first need to finish the switch from CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCD.

Cc: Marek Vasut marex@denx.de Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/arch-mx7ulp/clock.h | 2 +- arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c | 2 +- arch/arm/mach-uniphier/clk/clk-ld11.c | 2 +- arch/arm/mach-uniphier/clk/clk-ld4.c | 2 +- arch/arm/mach-uniphier/clk/clk-pro4.c | 2 +- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 +- board/compulab/cm_t54/cm_t54.c | 2 +- board/gumstix/duovero/duovero.c | 4 ++-- board/htkw/mcx/mcx.c | 4 ++-- board/overo/overo.c | 6 +++--- board/technexion/tao3530/tao3530.c | 4 ++-- board/technexion/twister/twister.c | 4 ++-- board/teejet/mt_ventoux/mt_ventoux.c | 4 ++-- board/ti/beagle/beagle.c | 6 +++--- board/ti/omap5_uevm/evm.c | 6 +++--- board/ti/panda/panda.c | 4 ++-- common/usb_storage.c | 2 +- drivers/usb/host/Kconfig | 6 ------ drivers/usb/host/Makefile | 2 +- include/configs/B4860QDS.h | 4 ++-- include/configs/BSC9131RDB.h | 4 ++-- include/configs/BSC9132QDS.h | 4 ++-- include/configs/M52277EVB.h | 2 +- include/configs/MPC8315ERDB.h | 2 +- include/configs/MPC8349ITX.h | 2 +- include/configs/MPC837XEMDS.h | 2 +- include/configs/MPC837XERDB.h | 2 +- include/configs/MPC8536DS.h | 4 ++-- include/configs/MPC8544DS.h | 4 ++-- include/configs/MPC8572DS.h | 4 ++-- include/configs/P1010RDB.h | 6 +++--- include/configs/P1022DS.h | 4 ++-- include/configs/P1023RDB.h | 4 ++-- include/configs/P2041RDB.h | 2 +- include/configs/T102xQDS.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T1040QDS.h | 4 ++-- include/configs/T104xRDB.h | 4 ++-- include/configs/T208xQDS.h | 4 ++-- include/configs/T208xRDB.h | 4 ++-- include/configs/T4240QDS.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/UCP1020.h | 4 ++-- include/configs/advantech_dms-ba16.h | 2 +- include/configs/alt.h | 2 +- include/configs/apalis-tk1.h | 2 +- include/configs/apalis_t30.h | 2 +- include/configs/aristainetos-common.h | 2 +- include/configs/at91sam9x5ek.h | 4 ++-- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/cei-tk1-som.h | 2 +- include/configs/cgtqmx6eval.h | 2 +- include/configs/cm_t35.h | 2 +- include/configs/cm_t3517.h | 2 +- include/configs/cm_t54.h | 2 +- include/configs/colibri_t20.h | 2 +- include/configs/colibri_t30.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/controlcenterd.h | 2 +- include/configs/corenet_ds.h | 2 +- include/configs/corvus.h | 2 +- include/configs/cyrus.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/ds414.h | 2 +- include/configs/duovero.h | 2 +- include/configs/e2220-1170.h | 2 +- include/configs/eco5pk.h | 2 +- include/configs/edminiv2.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/exynos5250-common.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/gose.h | 2 +- include/configs/gplugd.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/harmony.h | 2 +- include/configs/jetson-tk1.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/ls1012aqds.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atwr.h | 2 +- include/configs/lwmon5.h | 2 +- include/configs/m53evk.h | 2 +- include/configs/ma5d4evk.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/medcom-wide.h | 2 +- include/configs/mpc5121ads.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/mx35pdk.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6qarm2.h | 2 +- include/configs/mx6qsabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mxs.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/nyan-big.h | 2 +- include/configs/odroid.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_overo.h | 2 +- include/configs/omap4_panda.h | 2 +- include/configs/omap5_uevm.h | 2 +- include/configs/ot1200.h | 2 +- include/configs/p1_p2_rdb_pc.h | 4 ++-- include/configs/p1_twr.h | 4 ++-- include/configs/p2371-0000.h | 2 +- include/configs/p2371-2180.h | 2 +- include/configs/p2571.h | 2 +- include/configs/paz00.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/picosam9g45.h | 2 +- include/configs/platinum.h | 2 +- include/configs/plutux.h | 2 +- include/configs/porter.h | 2 +- include/configs/sama5d2_ptc.h | 2 +- include/configs/seaboard.h | 2 +- include/configs/sequoia.h | 6 +++--- include/configs/silk.h | 2 +- include/configs/snapper9g45.h | 2 +- include/configs/stout.h | 2 +- include/configs/sun4i.h | 2 +- include/configs/sun50i.h | 2 +- include/configs/sun5i.h | 2 +- include/configs/sun6i.h | 2 +- include/configs/sun7i.h | 2 +- include/configs/sun8i.h | 2 +- include/configs/tao3530.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/tec.h | 2 +- include/configs/tegra-common-post.h | 4 ++-- include/configs/titanium.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/trimslice.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vct.h | 2 +- include/configs/venice2.h | 2 +- include/configs/ventana.h | 2 +- include/configs/vinco.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/warp.h | 2 +- include/configs/whistler.h | 2 +- include/configs/x600.h | 2 +- include/configs/x86-common.h | 2 +- include/configs/xpedite550x.h | 2 +- include/configs/xpress.h | 2 +- include/configs/zmx25.h | 2 +- include/usb.h | 3 ++- 160 files changed, 193 insertions(+), 198 deletions(-)

diff --git a/arch/arm/include/asm/arch-mx7ulp/clock.h b/arch/arm/include/asm/arch-mx7ulp/clock.h index 170a9b3a7c8d..6424fafe146e 100644 --- a/arch/arm/include/asm/arch-mx7ulp/clock.h +++ b/arch/arm/include/asm/arch-mx7ulp/clock.h @@ -34,7 +34,7 @@ u32 imx_get_i2cclk(unsigned i2c_num); #ifdef CONFIG_MXC_OCOTP void enable_ocotp_clk(unsigned char enable); #endif -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD void enable_usboh3_clk(unsigned char enable); #endif void init_clk_usdhc(u32 index); diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c index 8de086efd6b5..a939b1fb8d12 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c @@ -161,7 +161,7 @@ void at91_spi1_hw_init(unsigned long cs_mask) } #endif

-#if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI) +#if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI_HCD) void at91_uhp_hw_init(void) { /* Enable VBus on UHP ports */ diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c index 36aa7879846e..0266e7e66b79 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld11.c +++ b/arch/arm/mach-uniphier/clk/clk-ld11.c @@ -33,7 +33,7 @@ void uniphier_ld11_clk_init(void) /* TODO: use "mmc-pwrseq-emmc" */ writel(1, SDCTRL_EMMC_HW_RESET);

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD { /* FIXME: the current clk driver can not handle parents */ u32 tmp; diff --git a/arch/arm/mach-uniphier/clk/clk-ld4.c b/arch/arm/mach-uniphier/clk/clk-ld4.c index 62b6927732a6..def87c1aac2c 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-ld4.c @@ -31,7 +31,7 @@ void uniphier_ld4_clk_init(void) #ifdef CONFIG_UNIPHIER_ETH tmp |= SC_CLKCTRL_CEN_ETHER; #endif -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC; #endif #ifdef CONFIG_NAND_DENALI diff --git a/arch/arm/mach-uniphier/clk/clk-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c index 92b73384abd2..19be4f3145c8 100644 --- a/arch/arm/mach-uniphier/clk/clk-pro4.c +++ b/arch/arm/mach-uniphier/clk/clk-pro4.c @@ -46,7 +46,7 @@ void uniphier_pro4_clk_init(void) #ifdef CONFIG_UNIPHIER_ETH tmp |= SC_CLKCTRL_CEN_ETHER; #endif -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC; #endif #ifdef CONFIG_NAND_DENALI diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index c661c77f83bd..81c2aad1a52d 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -212,7 +212,7 @@ int board_init(void) at91sam9x5ek_nand_hw_init(); #endif

-#if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI) +#if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI_HCD) at91_uhp_hw_init(); #endif #ifdef CONFIG_LCD diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c index 7b58fcd21f4a..757af9fd2618 100644 --- a/board/compulab/cm_t54/cm_t54.c +++ b/board/compulab/cm_t54/cm_t54.c @@ -181,7 +181,7 @@ int board_eth_init(bd_t *bis) } #endif

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[1] = OMAP_EHCI_PORT_MODE_HSIC, diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c index 11d2d7f45f1e..09b0c539450a 100644 --- a/board/gumstix/duovero/duovero.c +++ b/board/gumstix/duovero/duovero.c @@ -24,7 +24,7 @@ static void setup_net_chip(void); #endif

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #include <usb.h> #include <asm/arch/ehci.h> #include <asm/ehci-omap.h> @@ -206,7 +206,7 @@ int board_eth_init(bd_t *bis) return rc; }

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD

static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, diff --git a/board/htkw/mcx/mcx.c b/board/htkw/mcx/mcx.c index 12358f1b6198..1deb2bdd8b7b 100644 --- a/board/htkw/mcx/mcx.c +++ b/board/htkw/mcx/mcx.c @@ -19,7 +19,7 @@ #include <asm/arch/clock.h> #include <errno.h> #include <i2c.h> -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #include <usb.h> #include <asm/ehci-omap.h> #endif @@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR; /* Address of the framebuffer in RAM. */ #define FB_START_ADDRESS 0x88000000

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, diff --git a/board/overo/overo.c b/board/overo/overo.c index 5e447262bcfd..fd441d42ff0a 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -27,7 +27,7 @@ #include <asm/mach-types.h> #include "overo.h"

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #include <usb.h> #include <asm/ehci-omap.h> #endif @@ -393,7 +393,7 @@ void board_mmc_power_init(void) } #endif

-#if defined(CONFIG_USB_EHCI) +#if defined(CONFIG_USB_EHCI_HCD) static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, @@ -420,4 +420,4 @@ int ehci_hcd_stop(void) return omap_ehci_hcd_stop(); }

-#endif /* CONFIG_USB_EHCI */ +#endif /* CONFIG_USB_EHCI_HCD */ diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c index cba48d48fcfc..4b61973669a1 100644 --- a/board/technexion/tao3530/tao3530.c +++ b/board/technexion/tao3530/tao3530.c @@ -195,7 +195,7 @@ void board_mmc_power_init(void) } #endif

-#if defined(CONFIG_USB_EHCI) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD) /* Call usb_stop() before starting the kernel */ void show_boot_progress(int val) { @@ -219,4 +219,4 @@ int ehci_hcd_stop(int index) { return omap_ehci_hcd_stop(); } -#endif /* CONFIG_USB_EHCI */ +#endif /* CONFIG_USB_EHCI_HCD */ diff --git a/board/technexion/twister/twister.c b/board/technexion/twister/twister.c index ad4b02a753c5..25aeebc8d0e9 100644 --- a/board/technexion/twister/twister.c +++ b/board/technexion/twister/twister.c @@ -19,7 +19,7 @@ #include <spl.h> #include <mmc.h> #include <asm/gpio.h> -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #include <usb.h> #include <asm/ehci-omap.h> #endif @@ -46,7 +46,7 @@ static const u32 gpmc_XR16L2751[] = { XR16L2751_GPMC_CONFIG6, };

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, diff --git a/board/teejet/mt_ventoux/mt_ventoux.c b/board/teejet/mt_ventoux/mt_ventoux.c index 6b05541964cc..6e73ae114a65 100644 --- a/board/teejet/mt_ventoux/mt_ventoux.c +++ b/board/teejet/mt_ventoux/mt_ventoux.c @@ -23,7 +23,7 @@ #include <i2c.h> #include <spartan3.h> #include <asm/gpio.h> -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #include <usb.h> #include <asm/ehci-omap.h> #endif @@ -95,7 +95,7 @@ static const u32 gpmc_fpga[] = { FPGA_GPMC_CONFIG6, };

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index e90fe1aba81e..c1365e2e3507 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -36,7 +36,7 @@ #include "beagle.h" #include <command.h>

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #include <usb.h> #include <asm/ehci-omap.h> #endif @@ -538,7 +538,7 @@ void board_mmc_power_init(void) } #endif

-#if defined(CONFIG_USB_EHCI) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD) /* Call usb_stop() before starting the kernel */ void show_boot_progress(int val) { @@ -563,7 +563,7 @@ int ehci_hcd_stop(int index) return omap_ehci_hcd_stop(); }

-#endif /* CONFIG_USB_EHCI */ +#endif /* CONFIG_USB_EHCI_HCD */

#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) int board_eth_init(bd_t *bis) diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 64d772ca6e74..7eaffe3f7f41 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -20,7 +20,7 @@

#include "mux_data.h"

-#if defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_XHCI_OMAP) +#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP) #include <sata.h> #include <usb.h> #include <asm/gpio.h> @@ -151,7 +151,7 @@ int board_eth_init(bd_t *bis) return 0; }

-#if defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_XHCI_OMAP) +#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP) static void enable_host_clocks(void) { int auxclk; @@ -220,7 +220,7 @@ int board_mmc_init(bd_t *bis) } #endif

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[1] = OMAP_EHCI_PORT_MODE_HSIC, diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 187ff3cff4c4..58223664486b 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -15,7 +15,7 @@

#include "panda_mux_data.h"

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #include <usb.h> #include <asm/arch/ehci.h> #include <asm/ehci-omap.h> @@ -301,7 +301,7 @@ void board_mmc_power_init(void) #endif #endif

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD

static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, diff --git a/common/usb_storage.c b/common/usb_storage.c index 83279c449df5..03171f74cb02 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -100,7 +100,7 @@ struct us_data { trans_cmnd transport; /* transport routine */ };

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD /* * The U-Boot EHCI driver can handle any transfer length as long as there is * enough free heap space left, but the SCSI READ(10) and WRITE(10) commands are diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index fb5aa6f88918..c5e45dfad6f5 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -74,12 +74,6 @@ config USB_EHCI_HCD

You may want to read file:Documentation/usb/ehci.txt.

-config USB_EHCI - bool - default USB_EHCI_HCD - ---help--- - TODO: rename after most boards switch to Kconfig - if USB_EHCI_HCD

config USB_EHCI_ATMEL diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 58c0cf54c213..bf354fe8d521 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_USB_OHCI_LPC32XX) += ohci-lpc32xx.o obj-$(CONFIG_USB_OHCI_GENERIC) += ohci-generic.o

# echi -obj-$(CONFIG_USB_EHCI) += ehci-hcd.o +obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o obj-$(CONFIG_USB_EHCI_ARMADA100) += ehci-armada100.o utmi-armada100.o obj-$(CONFIG_USB_EHCI_ATMEL) += ehci-atmel.o ifdef CONFIG_MPC512X diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index abfdbc927677..75d0a0805bd7 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -723,9 +723,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB

#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 6f333e75ef7d..e628a1a855fa 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -334,9 +334,9 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SHA_HW_ACCEL #endif

-#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 9097932581c8..af7fead71513 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -476,8 +476,8 @@ combinations. this should be removed later #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif

-#define CONFIG_USB_EHCI /* USB */ -#ifdef CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD /* USB */ +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 7f5eecaad52f..0ce78d53258c 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -88,7 +88,7 @@

/* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_SYS_USB_EHCI_REGS_BASE 0xFC0B0000 #define CONFIG_SYS_USB_EHCI_CPU_INIT #endif diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 493e3fa646d1..ab1e41421153 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -366,7 +366,7 @@ #define CONFIG_HAS_FSL_DR_USB #define CONFIG_SYS_SCCR_USBDRCM 3

-#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_USB_PHY_TYPE "utmi" #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 719c27966a36..14494dc55561 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -148,7 +148,7 @@ /* * Support USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL

/* Current USB implementation supports the only USB controller, diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 85b7c48fdfae..ff75544bc37c 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -376,7 +376,7 @@ extern int board_pci_host_broken(void); #define CONFIG_PQ_MDS_PIB 1 /* PQ MDS Platform IO Board */

#define CONFIG_HAS_FSL_DR_USB 1 /* fixup device tree for the DR USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index d39dc1b465c0..2307693c313a 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -651,7 +651,7 @@ #define CONFIG_ENV_OVERWRITE

#define CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index aeb9f0bbaf0e..219d35980651 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -609,9 +609,9 @@ */ #define CONFIG_HAS_FSL_MPH_USB #ifdef CONFIG_HAS_FSL_MPH_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 8f7e056606e9..29f912e09277 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -359,9 +359,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_PCI_EHCI_DEVICE 0 diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index e6aca11e5003..4b5ffc0cbc39 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -559,9 +559,9 @@ /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_PCI_EHCI_DEVICE 0 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 95b42208e93f..126b6628751d 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -670,9 +670,9 @@ extern unsigned long get_sdram_size(void); #define CONFIG_HAS_FSL_DR_USB

#if defined(CONFIG_HAS_FSL_DR_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif @@ -733,7 +733,7 @@ extern unsigned long get_sdram_size(void);

#undef CONFIG_WATCHDOG /* watchdog disabled */

-#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \ +#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI_HCD) \ || defined(CONFIG_FSL_SATA) #endif

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index db66c309e7f0..2378b195c61a 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -606,9 +606,9 @@ */ #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 787b8d206efc..1a00985683be 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -253,9 +253,9 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index c3e3fae44f05..6a40af9539e9 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -594,7 +594,7 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_HAS_FSL_MPH_USB

#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 4da829d8389e..3cd636b9ba25 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -637,7 +637,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB

#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 3b55404cdab0..4dac070512e7 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -641,7 +641,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB

#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index b2810b65f9b9..018cb732a329 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -527,9 +527,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB

#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 55774080152d..2d80deac201b 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -637,9 +637,9 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_HAS_FSL_DR_USB

#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index a32ddeed1d26..affdd6bc7718 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -12,7 +12,7 @@ #define __T208xQDS_H

#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #if defined(CONFIG_ARCH_T2080) #define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_SRIO /* Enable Serial RapidIO Support */ @@ -702,7 +702,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 90ce554035d0..c019a8f52c9b 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -12,7 +12,7 @@ #define __T2080RDB_H

#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_FSL_SATA_V2

/* High Level Configuration Options */ @@ -652,7 +652,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 9d4baaa79fc1..9ec1f829a032 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -507,7 +507,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index cc1f79940cf3..801215e919dc 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -685,7 +685,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index c60743acd08a..77abee77da24 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -453,11 +453,11 @@ #define CONFIG_HAS_FSL_DR_USB

#if defined(CONFIG_HAS_FSL_DR_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

#define CONFIG_USB_MAX_CONTROLLER_COUNT 1

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 52f847566972..681fee16b84a 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -55,7 +55,7 @@ #define CONFIG_BOUNCE_BUFFER

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/alt.h b/include/configs/alt.h index d8a66f2d7d3d..22fdf01f4ab1 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -81,7 +81,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index c6c956e1ee1a..ab2401869500 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -36,7 +36,7 @@ #define CONFIG_SYS_MMC_ENV_PART 1

/* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* PCI host support */ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index e2acc6e8c9c5..75697e85c912 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -33,7 +33,7 @@ #define CONFIG_SYS_MMC_ENV_PART 1

/* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* PCI host support */ diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 4d16d3358547..42dc75ad1d7a 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -202,7 +202,7 @@ #define CONFIG_RTC_M41T11

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 52a051a13752..a5489cd28c93 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -51,7 +51,7 @@ #define CONFIG_CMD_NAND

/* - * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0) + * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0) * NB: in this case, USB 1.1 devices won't be recognized. */

@@ -99,7 +99,7 @@

/* USB */ #ifdef CONFIG_CMD_USB -#ifndef CONFIG_USB_EHCI +#ifndef CONFIG_USB_EHCI_HCD #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_UPLL #define CONFIG_USB_OHCI_NEW diff --git a/include/configs/beaver.h b/include/configs/beaver.h index cc328611695d..250375075532 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -39,7 +39,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index e338f9bdd254..3240c37866ab 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -43,7 +43,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 8185926590ed..8a3714bf837f 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -38,7 +38,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index e05db3ed8a16..117672d41bc3 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -61,7 +61,7 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 78f8e5d8d556..e1ea0d702ae2 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -75,7 +75,7 @@

/* USB */ #define CONFIG_USB_OMAP3 -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_MUSB_UDC #define CONFIG_TWL4030_USB diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index d157f240564c..55e543ad68ef 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -84,7 +84,7 @@

#ifndef CONFIG_USB_MUSB_AM35X #define CONFIG_USB_OMAP3 -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147 diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index d7e7c29298bd..ba35c18e5b37 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -58,7 +58,7 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) /* USB UHH support options */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 023e75cf33d1..5c9df5582846 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -25,7 +25,7 @@ #define CONFIG_SYS_I2C_TEGRA

/* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_MAX_CONTROLLER_COUNT 3

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index bc1904418d53..92caebcbeff3 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -33,7 +33,7 @@ #define CONFIG_SYS_MMC_ENV_PART 1

/* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index c7f174839f0f..ee491b874403 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -191,7 +191,7 @@ #endif

/* USB Host Support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_VF #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index b52f300af927..9f8c4addbfc5 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -291,7 +291,7 @@ /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

#define CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI_FSL diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index f42ba795eab8..725d85413117 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -608,7 +608,7 @@ #define CONFIG_HAS_FSL_MPH_USB

#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/corvus.h b/include/configs/corvus.h index bb1d0d7715d1..371547a5e403 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -96,7 +96,7 @@ #define CONFIG_AT91_WANTS_COMMON_PHY

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2

diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 904da1a8acc5..a33550cc3ec1 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -426,7 +426,7 @@ #define CONFIG_HAS_FSL_MPH_USB

#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_EHCI_IS_TDI diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index f3ff9e7494b0..072af4863057 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -35,7 +35,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index d1d4bf015643..c2ddaa027f21 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -74,7 +74,7 @@ #endif

#if !defined(CONFIG_USB_XHCI_HCD) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MARVELL #define CONFIG_EHCI_IS_TDI #endif diff --git a/include/configs/duovero.h b/include/configs/duovero.h index 4bb81e5d9cb4..a58c15c966a6 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -25,7 +25,7 @@ #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS

/* USB UHH support options */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index b6a758f0b20a..98fe6c601b44 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -33,7 +33,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB2.0 Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index 03cc74c59662..13fde3915e41 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -15,7 +15,7 @@

#include "tam3517-common.h"

-#undef CONFIG_USB_EHCI +#undef CONFIG_USB_EHCI_HCD #undef CONFIG_USB_EHCI_OMAP #undef CONFIG_USB_OMAP3

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index f7ac3027dd86..1b17cccce22c 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -171,7 +171,7 @@ * Common USB/EHCI configuration */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_MARVELL #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 68d48b2e6ae0..2de0eb31a9ee 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -35,7 +35,7 @@ #define CONFIG_SYS_I2C_SPEED 100000

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index aee9fea9da0e..9adce94d55d8 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -26,7 +26,7 @@ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_EXYNOS

#define CONFIG_USB_XHCI_EXYNOS diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 776910c6cddc..f1eb63ac7462 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -68,7 +68,7 @@

/* USB Configs */ #ifdef CONFIG_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/gose.h b/include/configs/gose.h index 8956841fbe43..2b0766e88e8c 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -78,7 +78,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 3ec7649a1d4a..f2ce28fdb9fb 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -82,7 +82,7 @@ #define CONFIG_ENV_SIZE 0x4000

#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ARMADA100 #define CONFIG_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 92eded6cdade..6ef07898f599 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -156,7 +156,7 @@ #define CONFIG_ARP_TIMEOUT 200UL

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 1a5d4b1dd5d0..8cd7cb583a22 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -36,7 +36,7 @@ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index b31ba6a4ee54..08d8272d8411 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -34,7 +34,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 1ca564f983d9..5f838618dd0a 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -78,7 +78,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/lager.h b/include/configs/lager.h index b619d153c92c..6268beec0210 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -80,7 +80,7 @@ #define CONFIG_SYS_TMU_CLK_DIV 4

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 3

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 229410680265..0b4ac4af0694 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -137,7 +137,7 @@

/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 8d7e54305d24..a8e1843910a4 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -115,7 +115,7 @@ /*#define CONFIG_HAS_FSL_DR_USB*/

#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 373de40d2980..d13517cee30a 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -402,7 +402,7 @@ unsigned long get_board_ddr_clk(void); /*#define CONFIG_HAS_FSL_DR_USB*/

#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 1ff3d9ee9e90..7f9357f32970 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -40,7 +40,7 @@ /*#define CONFIG_HAS_FSL_DR_USB*/

#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 911192da7a16..a1779a7ab8bd 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -362,7 +362,7 @@ /* * USB/EHCI */ -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_PPC4XX /* on PPC4xx platform */ #define CONFIG_SYS_PPC4XX_USB_ADDR 0xe0000300 #define CONFIG_EHCI_MMIO_BIG_ENDIAN diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index d85de5fa17fb..395635b37220 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -162,7 +162,7 @@ * USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index db58f735bcd1..cde3a6653bff 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -102,7 +102,7 @@ * USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 9e5c29f92f2c..8c8ab7c4781e 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -98,7 +98,7 @@ "128k@0x19C0000(swupdate-kernel-dtb.nor)"

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index b9b666fd3e43..b67c26bce7d3 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -29,7 +29,7 @@ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */

/* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index dafb724e3fc9..9f6d10edbb98 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -369,7 +369,7 @@ */

#if defined(CONFIG_CMD_USB) -#define CONFIG_USB_EHCI /* Enable EHCI Support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI Support */ #define CONFIG_USB_EHCI_FSL /* On a FSL platform */ #define CONFIG_EHCI_MMIO_BIG_ENDIAN /* With big-endian regs */ #define CONFIG_EHCI_DESC_BIG_ENDIAN diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 814f0dd7ca1b..5146f9b9f6c5 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -121,7 +121,7 @@ * Common USB/EHCI configuration */ #if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM) -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */

diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 79d92bb06ad3..e49578e02baf 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -199,7 +199,7 @@ #define CONFIG_SYS_NAND_LARGEPAGE

/* EHCI driver */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1 #define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index dfd7ea9d4533..d9fb66580faf 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -73,7 +73,7 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1F

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 3094402d15a1..c61ed89b6f8d 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -45,7 +45,7 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1F

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 945be5835bf4..600b9d4ea1af 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -42,7 +42,7 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1F

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 84fdf656cd66..5d8b6d8feaaa 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -44,7 +44,7 @@ #define CONFIG_IMX_VIDEO_SKIP

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 9f4273557195..7e329d682dae 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -128,7 +128,7 @@

/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index ef7675c68815..44757c27579a 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -15,7 +15,7 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2"

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 598ab9aa2eec..702706deeddc 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -63,7 +63,7 @@

/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 2fff7995eac7..f45b8d06bdb3 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -159,7 +159,7 @@

/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 971f6c2f3175..33354c3a9c78 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -149,7 +149,7 @@ #define CONFIG_PHY_ATHEROS

#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index dafa946e4786..93a2bdaaa82d 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -167,7 +167,7 @@ #define CONFIG_PHY_ATHEROS

#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 240d3a226c39..86a7b97512e6 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -186,7 +186,7 @@

/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mxs.h b/include/configs/mxs.h index fdf596f82f0b..17e1bbca1f5f 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -168,7 +168,7 @@

/* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MXS #define CONFIG_EHCI_IS_TDI #endif diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 861cb5df57d9..84d706caf9f4 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -94,7 +94,7 @@ * USB/EHCI */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */ #define CONFIG_EHCI_IS_TDI #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index cacc1b81f073..f450b71e437f 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -74,7 +74,7 @@ #define CONFIG_PHY_MICREL_KSZ9021

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/novena.h b/include/configs/novena.h index df0efbca92d5..590c1211f2ae 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -135,7 +135,7 @@

/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index d9d4f2d5837c..249af9979c0d 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -39,7 +39,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 6cc7dd16a2fa..899ca5e887a6 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -188,7 +188,7 @@ #define CONFIG_LIB_HW_RAND

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_EXYNOS

#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 40b48f70abf7..8469839b185b 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -41,7 +41,7 @@ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_EXYNOS

/* DFU */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index c91d0935bab0..93aa17ed475f 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -55,7 +55,7 @@ #define CONFIG_FASTBOOT_BUF_SIZE 0x07000000

/* USB EHCI */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

#define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 40107e42166c..447ab47296c0 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -40,7 +40,7 @@ #define CONFIG_TWL4030_LED

/* USB EHCI */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 183 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index a6078daca6f7..967f2fa84e23 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -17,7 +17,7 @@ */

/* USB UHH support options */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 6ac5d506f6a4..522df942c3ac 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -52,7 +52,7 @@ #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22

/* USB UHH support options */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index b4d2b0a87152..cfa6199d95d4 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -55,7 +55,7 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index d995d0448c5f..d3b3fb676a9c 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -823,9 +823,9 @@ #define CONFIG_HAS_FSL_DR_USB

#if defined(CONFIG_HAS_FSL_DR_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index dad0616517db..1c05926efc19 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -394,9 +394,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_HAS_FSL_DR_USB

#if defined(CONFIG_HAS_FSL_DR_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 897add3dd05f..b5ef933bc185 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -33,7 +33,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB2.0 Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 3cf0c87be435..fb57a17ded4e 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -33,7 +33,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB2.0 Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 76fb7cec87ae..b496c61938e0 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -34,7 +34,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB2.0 Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 2e8cbd94cf62..13485045f2bc 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -29,7 +29,7 @@ #define CONFIG_SYS_MMC_ENV_PART 2

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 26b1b1147cb2..d3fe63fa65cb 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -37,7 +37,7 @@ #define CONFIG_SUPPORT_EMMC_BOOT

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 733768aa7b2d..02940267bc4d 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -98,7 +98,7 @@ #define CONFIG_AT91_WANTS_COMMON_PHY

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2

diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 6687c38c9927..53a130aa3615 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -52,7 +52,7 @@ #define CONFIG_PHYLIB

/* USB config */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 911cad8cdd73..1db2e9b62f91 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -29,7 +29,7 @@ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */

/* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/porter.h b/include/configs/porter.h index fabab73680cf..827c7b249a72 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -82,7 +82,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 16bafc099076..011296882899 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -66,7 +66,7 @@ #define CONFIG_CMD_USB

#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #endif diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 207b59118d0b..9c11fe29f6e3 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -37,7 +37,7 @@ #define CONFIG_SYS_MMC_ENV_PART 2

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index f5b03caf830b..cf62a95246cc 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -193,15 +193,15 @@ /* USB */ #ifdef CONFIG_440EPX

-#undef CONFIG_USB_EHCI /* OHCI by default */ +#undef CONFIG_USB_EHCI_HCD /* OHCI by default */

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PPC4XX #define CONFIG_SYS_PPC4XX_USB_ADDR 0xe0000300 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_EHCI_MMIO_BIG_ENDIAN #define CONFIG_EHCI_DESC_BIG_ENDIAN -#else /* CONFIG_USB_EHCI */ +#else /* CONFIG_USB_EHCI_HCD */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_OHCI_BE_CONTROLLER

diff --git a/include/configs/silk.h b/include/configs/silk.h index 4fc270fcc22e..38febae249d5 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -82,7 +82,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 952c6f546fd7..56a6aad81814 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -61,7 +61,7 @@ #define CONFIG_TFTP_TSIZE

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2

diff --git a/include/configs/stout.h b/include/configs/stout.h index 90258c2f42eb..ac63e53b08ac 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -84,7 +84,7 @@ #define CONFIG_SYS_TMU_CLK_DIV 4

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 3

diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index 3dfd95ad77fa..bd349694c641 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -12,7 +12,7 @@ * A10 specific configuration */

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif

diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h index 1b7bfb6c22eb..b7b67a1ddc08 100644 --- a/include/configs/sun50i.h +++ b/include/configs/sun50i.h @@ -11,7 +11,7 @@ * A64 specific configuration */

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index ec8f3199ba34..0535d6a7f327 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -12,7 +12,7 @@ * High Level Configuration Options */

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif

diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index 6c1eca4d2683..8b9adb1be66b 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -15,7 +15,7 @@ * A31 specific configuration */

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif

diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index 5455901efe3f..12c96230c271 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -13,7 +13,7 @@ * A20 specific configuration */

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif

diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 6ac42acaeadd..47f281324076 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -13,7 +13,7 @@ * A23 specific configuration */

-#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif

diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 834fe174d640..de44aa5cf76d 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -228,7 +228,7 @@ */

/* USB EHCI */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b4a14eae7c4b..d297c27506d1 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -93,7 +93,7 @@

/* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 06d8720df2b6..decf8ba682a7 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -33,7 +33,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/tec.h b/include/configs/tec.h index b380a69bdf75..e3add13dbfd2 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -29,7 +29,7 @@ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */

/* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index ab4136ab1389..568236c842a0 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -123,8 +123,8 @@ #endif

/* remove USB */ -#ifdef CONFIG_USB_EHCI -#undef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD +#undef CONFIG_USB_EHCI_HCD #endif #ifdef CONFIG_USB_EHCI_TEGRA #undef CONFIG_USB_EHCI_TEGRA diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 2c05f9c9308f..0dedffd746ca 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -50,7 +50,7 @@ #define CONFIG_PHY_MICREL_KSZ9021

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index e662e65204e3..0267705a78c2 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -81,7 +81,7 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 2c37107a3c08..67ac2ea1bd44 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -36,7 +36,7 @@ #define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 58b62d244895..70bb25da4527 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -41,7 +41,7 @@ #define CONFIG_SYS_FSL_ESDHC_NUM 1

/* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/vct.h b/include/configs/vct.h index 9db6fee6e78e..61b9488569ab 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -99,7 +99,7 @@ /* * USB/EHCI */ -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_VCT /* on VCT platform */ #define CONFIG_EHCI_MMIO_BIG_ENDIAN #define CONFIG_EHCI_DESC_BIG_ENDIAN diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 9e83863c0a4c..ec2f0a7117eb 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -34,7 +34,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20)

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 0e851a1b1086..5c27aa749042 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -27,7 +27,7 @@ #define CONFIG_SYS_MMC_ENV_PART 2

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/vinco.h b/include/configs/vinco.h index c146f773dbf2..4d6feb8a08f3 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -66,7 +66,7 @@ /* USB */

#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #endif diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 9a517a973893..01a4c55039f8 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -76,7 +76,7 @@ #define CONFIG_PHY_ATHEROS

#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 47daf724ab66..7ce129e3834c 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -50,7 +50,7 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/warp.h b/include/configs/warp.h index 5274b274a418..048ba036a34c 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -58,7 +58,7 @@

/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/whistler.h b/include/configs/whistler.h index 429e5b6a3208..6b605fd60c90 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -36,7 +36,7 @@ #define CONFIG_SYS_MMC_ENV_PART 2

/* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA

/* USB networking support */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 6e52e5622262..bb47c93b663b 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -100,7 +100,7 @@ #define CONFIG_FPGA_COUNT 1

/* USB EHCI options */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SPEAR #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 653a30d3bd06..f905890ae7f0 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -134,7 +134,7 @@ /*----------------------------------------------------------------------- * USB configuration */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PCI #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 12 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 2793a9bfb962..264fb55e2e35 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -332,7 +332,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

diff --git a/include/configs/xpress.h b/include/configs/xpress.h index e3ae4e8f7455..239716edc367 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -64,7 +64,7 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */

/* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index c61c353901ff..05094a62d75c 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -82,7 +82,7 @@ * USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_MXC #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORT 1 diff --git a/include/usb.h b/include/usb.h index 02a0ccdd77b3..62f051fe535c 100644 --- a/include/usb.h +++ b/include/usb.h @@ -187,7 +187,8 @@ 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_USB_MUSB_HOST || defined(CONFIG_DM_USB) +#if defined CONFIG_USB_EHCI_HCD || 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);