Follow the exiting logic for the i.MX options when migrating this option.
Cc: Marek Vasut marex@denx.de Signed-off-by: Tom Rini trini@konsulko.com --- configs/eco5pk_defconfig | 1 + drivers/usb/host/Kconfig | 8 ++++++++ include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/cm_t54.h | 1 - include/configs/duovero.h | 1 - include/configs/eco5pk.h | 1 - include/configs/mcx.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap4_panda.h | 1 - include/configs/omap5_uevm.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - scripts/config_whitelist.txt | 1 - 15 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index a6de0b23e12b..61ac94bbba86 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -25,5 +25,6 @@ CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_OMAP is not set CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 03c15dd6293e..9a67e43c2d94 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -105,6 +105,14 @@ config USB_EHCI_MX7 ---help--- Enables support for the on-chip EHCI controller on i.MX7 SoCs.
+config USB_EHCI_OMAP + bool "Support for OMAP3+ on-chip EHCI USB controller" + depends on ARCH_OMAP2PLUS + default y + ---help--- + Enables support for the on-chip EHCI controller on OMAP3 and later + SoCs. + if USB_EHCI_MX7
config MXC_USB_OTG_HACTIVE diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 425b14957466..1898e3837d52 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -75,7 +75,6 @@
/* USB */ #define CONFIG_USB_OMAP3 -#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 2417d16375c0..0df7d4269cbb 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -84,7 +84,6 @@
#ifndef CONFIG_USB_MUSB_AM35X #define CONFIG_USB_OMAP3 -#define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147 #else /* !CONFIG_USB_MUSB_AM35X */ diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 5c3bf6930046..ccaa56800946 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -58,7 +58,6 @@ #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_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
diff --git a/include/configs/duovero.h b/include/configs/duovero.h index e7fcc7e01899..f1422316891f 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
/* USB UHH support options */ -#define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1 diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index c0953d7c04b0..3d7a168bc4ee 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -15,7 +15,6 @@
#include "tam3517-common.h"
-#undef CONFIG_USB_EHCI_OMAP #undef CONFIG_USB_OMAP3
/* Our console port is port3 */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 09f8b968ede8..c70e68c5b0c3 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -73,7 +73,6 @@ 115200}
/* EHCI */ -#define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index d27ceec30c96..0d48d4ecc1c9 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -56,7 +56,6 @@
/* USB EHCI */
-#define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 050c3b1f4309..111aec58d391 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -40,7 +40,6 @@ #define CONFIG_TWL4030_LED
/* USB EHCI */ -#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 51a3c8c409ff..e1263b68bcf2 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -17,7 +17,6 @@ */
/* USB UHH support options */ -#define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 74d598a57778..d8b0c023b94b 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
/* USB UHH support options */ -#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/tam3517-common.h b/include/configs/tam3517-common.h index 7d898f831ef7..34ce122489a0 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -66,7 +66,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} /* EHCI */ -#define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 4f57ef15d4f6..ae6c768c2295 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -228,7 +228,6 @@ */
/* USB EHCI */ -#define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 140185b4f8e8..0cb5d338ab12 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -6285,7 +6285,6 @@ CONFIG_USB_EHCI_KIRKWOOD CONFIG_USB_EHCI_MX5 CONFIG_USB_EHCI_MXC CONFIG_USB_EHCI_MXS -CONFIG_USB_EHCI_OMAP CONFIG_USB_EHCI_PCI CONFIG_USB_EHCI_PPC4XX CONFIG_USB_EHCI_RMOBILE