arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb
config to defconfig.

Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 7ad5c217834c15fba6fce982c8d3ea739dd15573..07a84bbc3e33d4fd4b34d219d682cd14ce5c3f5b 100644 (file)
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -15,4 +15,8 @@ CONFIG_CMD_PING=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
+CONFIG_USB=y
 CONFIG_CMD_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MX6=y
+CONFIG_USB_STORAGE=y

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 8705c7c44c2742c5d2dc0190deec46177fdc18e2..b30b43da3b566dbd9782041770f45b43813ff1b8 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -52,6 +52,13 @@ config USB_EHCI
 
 if USB_EHCI_HCD
 
+config USB_EHCI_MX6
+       bool "Support for i.MX6 on-chip EHCI USB controller"
+       depends on ARCH_MX6
+       default y
+       ---help---
+         Enables support for the on-chip EHCI controller on i.MX6 SoCs.
+
 config USB_EHCI_UNIPHIER
        bool "Support for UniPhier on-chip EHCI USB controller"
        depends on ARCH_UNIPHIER && OF_CONTROL

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 9b00c0d2f26722d932ec1a24c1c704dd04d26f4b..9f69322f08e47c58ca0ebeb5a47fbcf35ab21122 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -198,9 +198,6 @@
 #define CONFIG_NET_RETRY_COUNT         5
 
 /* USB */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
-#define CONFIG_USB_STORAGE
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2