This converts the following to Kconfig: CONFIG_EHCI_HCD_INIT_AFTER_RESET
Signed-off-by: Tom Rini trini@konsulko.com --- drivers/usb/host/Kconfig | 5 ++++- include/configs/MPC837XERDB.h | 1 - include/configs/P1010RDB.h | 6 ------ include/configs/P2041RDB.h | 4 ---- include/configs/T102xRDB.h | 4 ---- include/configs/T104xRDB.h | 6 ------ include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/aristainetos2.h | 1 - include/configs/brppt2.h | 1 - include/configs/cl-som-imx7.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri-imx6ull.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/corenet_ds.h | 4 ---- include/configs/dart_6ul.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/dragonboard410c.h | 4 ---- include/configs/embestmx6boards.h | 1 - include/configs/ge_b1x5v2.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/imx6_logic.h | 1 - include/configs/imx6dl-mamoj.h | 1 - include/configs/imx6q-bosch-acc.h | 1 - include/configs/imx8mm-cl-iot-gate.h | 1 - include/configs/kontron-sl-mx6ul.h | 1 - include/configs/kontron-sl-mx8mm.h | 1 - include/configs/kp_imx6q_tpc.h | 1 - include/configs/liteboard.h | 1 - include/configs/meerkat96.h | 1 - include/configs/mx6sabreauto.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/mys_6ulx.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/npi_imx6ull.h | 1 - include/configs/omap5_uevm.h | 3 --- include/configs/opos6uldev.h | 1 - include/configs/p1_p2_rdb_pc.h | 6 ------ include/configs/pcl063.h | 1 - include/configs/pcl063_ull.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 1 - include/configs/somlabs_visionsom_6ull.h | 1 - include/configs/tbs2910.h | 1 - include/configs/tqma6.h | 2 -- include/configs/verdin-imx8mm.h | 1 - include/configs/vining_2000.h | 1 - include/configs/warp.h | 1 - include/configs/xpress.h | 1 - 57 files changed, 4 insertions(+), 87 deletions(-)
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 8e0ecc5e41e0..5d0855ffcc79 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -260,9 +260,12 @@ config USB_EHCI_GENERIC ---help--- Enables support for generic EHCI controller.
+config EHCI_HCD_INIT_AFTER_RESET + bool + config USB_EHCI_FSL bool "Support for FSL on-chip EHCI USB controller" - select CONFIG_EHCI_HCD_INIT_AFTER_RESET + select EHCI_HCD_INIT_AFTER_RESET ---help--- Enables support for the on-chip EHCI controller on FSL chips. endif # USB_EHCI_HCD diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index d356ff95944d..01e62668fa52 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -307,7 +307,6 @@ */
#define CONFIG_HAS_FSL_DR_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_NETDEV "eth1"
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ce63e640d5c6..3773b125327c 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -492,12 +492,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_HAS_FSL_DR_USB
-#if defined(CONFIG_HAS_FSL_DR_USB) -#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#endif -#endif - /* * Environment */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 9cce6cf68daa..dfe92bcea099 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -379,10 +379,6 @@ #define CONFIG_HAS_FSL_DR_USB #define CONFIG_HAS_FSL_MPH_USB
-#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#endif - #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 618b8ed845a1..43cf604fdd5c 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -401,10 +401,6 @@ */ #define CONFIG_HAS_FSL_DR_USB
-#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#endif - /* * SDHC */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 3f4e59fa8ab2..da0a4f206ef5 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -405,12 +405,6 @@ */ #define CONFIG_HAS_FSL_DR_USB
-#ifdef CONFIG_HAS_FSL_DR_USB -#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#endif -#endif - #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index b4a91eacb9e0..dfe9192df128 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -475,7 +475,6 @@ * USB */ #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB #endif
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 84e5d5df38df..a5a30d8c8555 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -431,7 +431,6 @@ * USB */ #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB #endif
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 2ab1b647a86b..7690bee48459 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -448,7 +448,6 @@ /* * USB */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB
#ifdef CONFIG_MMC diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 286440514713..d0e0e65d85f9 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -38,7 +38,6 @@ /* USB Configs */ /* Host */ #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) #define CONFIG_MXC_USB_FLAGS 0 /* Client */ diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 026775de7c56..2fd505dffdc0 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -422,7 +422,6 @@ /* DMA stuff, needed for GPMI/MXS NAND support */
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 7b110f05ca44..19276cc6ecab 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -86,7 +86,6 @@ BUR_COMMON_ENV \ #define CONFIG_FEC_FIXED_SPEED _1000BASET
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
/* SPL */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index b19b3ef541c7..c63c5ebb672e 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -102,7 +102,6 @@ #endif
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index cb4cd925d9fd..07ad6fde28d0 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -148,7 +148,6 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */
/* SATA */ #define CONFIG_LBA48 diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 0459cb0286e3..da5b8a6f80fa 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -135,7 +135,6 @@ #endif
/* USB Configs */ -#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/colibri_imx6.h b/include/configs/colibri_imx6.h index d7d5c2ddee15..f62a3f6688ed 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -28,7 +28,6 @@ /* USB Configs */ /* Host */ #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) #define CONFIG_MXC_USB_FLAGS 0 /* Client */ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 180142a64879..d78a27347c56 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -179,7 +179,6 @@ #endif
/* USB Configs */ -#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/colibri_vf.h b/include/configs/colibri_vf.h index 32e2aabc67c7..664c538f6dcd 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -98,7 +98,6 @@
/* USB Host Support */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
/* USB DFU */
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 9291b81ac2a6..54e79b16d653 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -377,10 +377,6 @@ #define CONFIG_HAS_FSL_DR_USB #define CONFIG_HAS_FSL_MPH_USB
-#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#endif - #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index d502e98deae7..9f27072f12ff 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index b495826301e7..298a88c92eda 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -41,7 +41,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index ed46f26628f1..26a714c2886b 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -22,10 +22,6 @@
/* UART */
-/* Fixup - in init code we switch from device to host mode, - * it has to be done after each HCD reset */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET - #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) \ func(MMC, mmc, 1) \ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 00996f5cb784..7526d3b0f515 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -18,7 +18,6 @@ #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index 252ab5e7473d..61ca5f8b34ab 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -29,7 +29,6 @@ #endif
/* USB */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 26d171daae7d..6aa6c6262e3f 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -55,7 +55,6 @@ /* Various command support */
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 592c62ab8acc..6b1c67867da0 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -122,7 +122,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index c4eebb5aeac0..2707ae644067 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -45,7 +45,6 @@ #define CONFIG_FEC_MXC_PHYADDR 1
/* USB */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h index 785ac7c50148..e904a10b6e86 100644 --- a/include/configs/imx6q-bosch-acc.h +++ b/include/configs/imx6q-bosch-acc.h @@ -111,7 +111,6 @@ #endif #endif
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */ diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 297d56b427f8..c559778c1d32 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -144,7 +144,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index b6e68f8f41ac..d04684955d3c 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -29,7 +29,6 @@ #define CONFIG_HOSTNAME "kontron-mx6ul"
#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 95b836c54702..64bfddde3b00 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -27,7 +27,6 @@ #define CONFIG_HOSTNAME "kontron-mx8mm"
#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 5b25be5c9254..a513213c5980 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -21,7 +21,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 3c03368b5c0a..fa178fbe9365 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -98,7 +98,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h index 0ccfe7db5a4d..c6ce8837474e 100644 --- a/include/configs/meerkat96.h +++ b/include/configs/meerkat96.h @@ -24,7 +24,6 @@ /* Environment configs */
/* USB configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#endif diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index d120c7c7a352..d0cf6a2251c3 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -17,7 +17,6 @@
/* USB Configs */ #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) #define CONFIG_MXC_USB_FLAGS 0
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 2f4332a4b19f..18d5d4988cf4 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -36,7 +36,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index e03226d4180a..837742b8039c 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -94,7 +94,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 272492466de9..b3a786da4801 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -97,7 +97,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0x0
#ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index fda5b03b60f6..a5596d98fe68 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -124,7 +124,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1
#ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 44e6fd0156fa..7c76290a2aeb 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -119,7 +119,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index fb685ec9631c..d1dc445a9b73 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_NAND_BASE 0x40000000
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 3aa21a28d155..72f2dfb5daca 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -33,7 +33,6 @@
/* USB Configs */ #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) #define CONFIG_MXC_USB_FLAGS 0
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 1fc4b87cab74..b3de41852fed 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -35,7 +35,6 @@ #define CONFIG_SYS_NAND_BASE 0x40000000
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 75e84c35ee06..cce5556fe266 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -40,9 +40,6 @@ #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
-/* USB UHH support options */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET - /* Enabled commands */
/* USB Networking options */ diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index 8624d24b6eaa..ebfba72d0da4 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -24,7 +24,6 @@
/* USB */ #ifdef 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 #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 f74ad628fee7..76b46cab4cd8 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -458,12 +458,6 @@ */ #define CONFIG_HAS_FSL_DR_USB
-#if defined(CONFIG_HAS_FSL_DR_USB) -#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#endif -#endif - #if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index 659f20e63abb..c6c417b6292a 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -46,7 +46,6 @@ #define CONFIG_SYS_NAND_BASE 0x40000000
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index 0d099fa14c2d..4c1d24f64fd5 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_NAND_BASE 0x40000000
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index ea30fbc4cfcc..7e57d7b14222 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 5a6f22442014..39705d95692f 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -116,7 +116,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index 98966cfeb91d..bab4bf3deb34 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -66,7 +66,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 1ebe28b7c1ba..eb63e75cddf5 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -44,7 +44,6 @@
/* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #ifdef CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USBD_HS diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 3290ec021fd9..d60fe51eaf98 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -53,8 +53,6 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ -
#if defined(CONFIG_TQMA6X_MMC_BOOT)
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 8f464dd39f0b..a93d94dafe4e 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -79,7 +79,6 @@ #define CONFIG_FEC_MXC_PHYADDR 7
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index a447ec8c3446..487ab3d664cc 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -41,7 +41,6 @@ /* Network */ #define CONFIG_FEC_MXC_PHYADDR 0x0
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/warp.h b/include/configs/warp.h index 74fa03b53d82..5716f8f9a600 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -34,7 +34,6 @@
/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Only OTG2 port enabled */ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 8e36d1c4c3e0..81f8d64067dc 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -31,7 +31,6 @@ /* Environment is in stored in the eMMC boot partition */
/* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2