The following options are migrated over fully now: - USB_EHCI_ATMEL - USB_EHCI_MARVELL - USB_EHCI_MX6 - USB_EHCI_MX7 - USB_EHCI_MSM - USB_EHCI_ZYNQ - USB_EHCI_GENERIC
This also requires fixing the depends on USB_EHCI_MARVELL as it's used by Orion5X and Kirkwood as well.
Cc: Marek Vasut marex@denx.de Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-kirkwood/include/mach/config.h | 1 - drivers/usb/host/Kconfig | 4 ++-- include/configs/advantech_dms-ba16.h | 1 - include/configs/aristainetos-common.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/corvus.h | 1 - include/configs/ds414.h | 1 - include/configs/edminiv2.h | 1 - include/configs/embestmx6boards.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/liteboard.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/mccmon6.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6qarm2.h | 1 - include/configs/mx6qsabreauto.h | 1 - include/configs/mx6sabresd.h | 1 - include/configs/mx6slevk.h | 1 - include/configs/mx6sxsabreauto.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/ot1200.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/platinum.h | 1 - include/configs/sama5d2_ptc.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/tbs2910.h | 1 - include/configs/titanium.h | 1 - include/configs/tqma6.h | 1 - include/configs/vinco.h | 1 - include/configs/vining_2000.h | 1 - include/configs/wandboard.h | 1 - include/configs/warp.h | 1 - include/configs/xpress.h | 1 - 38 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index b786df0aaf61..c7beb58e8000 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -89,7 +89,6 @@ * USB/EHCI */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MARVELL #define CONFIG_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index ab2ae737c81e..03c15dd6293e 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -85,8 +85,8 @@ config USB_EHCI_ATMEL Enables support for the on-chip EHCI controller on Atmel chips.
config USB_EHCI_MARVELL - bool "Support for MVEBU (AXP / A38x) on-chip EHCI USB controller" - depends on ARCH_MVEBU + bool "Support for Marvell on-chip EHCI USB controller" + depends on ARCH_MVEBU || KIRKWOOD || ORION5X default y ---help--- Enables support for the on-chip EHCI controller on MVEBU SoCs. diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 2a39ae572a6e..b76f376a042f 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -55,7 +55,6 @@ #define CONFIG_BOUNCE_BUFFER
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 3d5130405dee..7360e11ff14d 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -202,7 +202,6 @@ #define CONFIG_RTC_M41T11
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 46c297e24234..cad1357f5cfd 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -61,7 +61,6 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 565f8a98b1eb..71b428f1f745 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -96,7 +96,6 @@ #define CONFIG_AT91_WANTS_COMMON_PHY
/* USB */ -#define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
/* USB DFU support */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index d08c3245870b..2c83a716a384 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -74,7 +74,6 @@ #endif
#if !defined(CONFIG_USB_XHCI_HCD) -#define CONFIG_USB_EHCI_MARVELL #define CONFIG_EHCI_IS_TDI #endif
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 498a4d150487..d1c7b937e36b 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -171,7 +171,6 @@ * Common USB/EHCI configuration */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MARVELL #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 6b53c008c5ed..749a9e3bc17d 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -35,7 +35,6 @@ #define CONFIG_SYS_I2C_SPEED 100000
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index e1fc67e45741..198259b3c0d4 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -68,7 +68,6 @@
/* USB Configs */ #ifdef CONFIG_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index cff9fe8fc896..1c18a380fef6 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -156,7 +156,6 @@ #define CONFIG_ARP_TIMEOUT 200UL
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 6a4d2810cf71..016d54f138c5 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -137,7 +137,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index bb8542646e40..8413c5c23463 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -102,7 +102,6 @@ * USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
/* USB device */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 996b2d1774ab..4b9b5312bf86 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -98,7 +98,6 @@ "128k@0x19C0000(swupdate-kernel-dtb.nor)"
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 87bec2946c03..b2cecc5d0eb4 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -44,7 +44,6 @@ #define CONFIG_IMX_VIDEO_SKIP
/* USB */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 0a04244e02c0..de5dc1c45175 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -128,7 +128,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 00b3bc87ddaa..635c04acf9ea 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -15,7 +15,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2"
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 1fd972f918c6..a8c0e035829a 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -63,7 +63,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index c05078227a58..6ab76bb8fa10 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -159,7 +159,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 8809d8011f79..3e73dad9a3ff 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -149,7 +149,6 @@ #define CONFIG_PHY_ATHEROS
#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index bdec09b7f3ec..b39ab729d8a4 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -167,7 +167,6 @@ #define CONFIG_PHY_ATHEROS
#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 98d9755abb3d..2c40decf499b 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -186,7 +186,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index de57b2e83ea8..13625286c5b7 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -74,7 +74,6 @@ #define CONFIG_PHY_MICREL_KSZ9021
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_MCS7830 diff --git a/include/configs/novena.h b/include/configs/novena.h index b57ef30f942c..e0ed30458656 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -135,7 +135,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 826bef19e14a..34da90f20b6a 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -55,7 +55,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2
/* USB Configs */ -#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/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 1ede6c92ec9e..8d78f49c9684 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -37,7 +37,6 @@ #define CONFIG_SUPPORT_EMMC_BOOT
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index c6d23a658277..998a7a344b2b 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -98,7 +98,6 @@ #define CONFIG_AT91_WANTS_COMMON_PHY
/* USB */ -#define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/platinum.h b/include/configs/platinum.h index a628971a808f..9c2182cbea30 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -52,7 +52,6 @@ #define CONFIG_PHYLIB
/* USB config */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 1a01ff742239..7d20d65bf3b1 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -66,7 +66,6 @@ #define CONFIG_CMD_USB
#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #endif
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index ab9f8d62fa3a..99b5b23d2940 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -61,7 +61,6 @@ #define CONFIG_TFTP_TSIZE
/* USB */ -#define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
/* MMC */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index f94eda8aacba..9720a09b3233 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -93,7 +93,6 @@
/* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 1b00db57d74e..79e37e2cefb0 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -50,7 +50,6 @@ #define CONFIG_PHY_MICREL_KSZ9021
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index cf8ae9fffebb..738693c0c008 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -81,7 +81,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 1651431ccaff..dc35b289d42a 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -66,7 +66,6 @@ /* USB */
#ifdef CONFIG_CMD_USB -#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 dda01132637b..78e14b38c113 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -76,7 +76,6 @@ #define CONFIG_PHY_ATHEROS
#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 6a9665370241..3e0ea71e69af 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/warp.h b/include/configs/warp.h index ec95061d6092..afe3eaed46d1 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -58,7 +58,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/xpress.h b/include/configs/xpress.h index efc364ff6c68..e13b792f3867 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -64,7 +64,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */
/* USB Configs */ -#define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0