From 7b805009fab3fae923ccc17db11de64769a3947c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
Date: Sat, 9 Oct 2021 15:27:33 +0200
Subject: [PATCH] Convert CONFIG_USB_EHCI_MXS to Kconfig
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This option is only used for
  mx23evk_defconfig
  mx23_olinuxino_defconfig
which are the only i.MX23 boards.

Add depend on ARCH_MX23 and default to y.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 drivers/usb/host/Kconfig     | 7 +++++++
 include/configs/mxs.h        | 1 -
 scripts/config_whitelist.txt | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 10b0479a8a..be5e4b994d 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -175,6 +175,13 @@ config USB_EHCI_MX7
 	---help---
 	  Enables support for the on-chip EHCI controller on i.MX7 SoCs.
 
+config USB_EHCI_MXS
+	bool "Support for i.MX23 EHCI USB controller"
+	depends on ARCH_MX23
+	default y
+	help
+	  Enables support for the on-chip EHCI controller on i.MX23 SoCs.
+
 config USB_EHCI_OMAP
 	bool "Support for OMAP3+ on-chip EHCI USB controller"
 	depends on ARCH_OMAP2PLUS
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index d7d3e9d57f..ee2d7fa1b7 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -123,7 +123,6 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MXS
 #define CONFIG_USB_EHCI_IS_TDI
 #endif
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index de592646b2..619e7260d4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3015,7 +3015,6 @@ CONFIG_USB_EHCI_EXYNOS
 CONFIG_USB_EHCI_FARADAY
 CONFIG_USB_EHCI_IS_TDI
 CONFIG_USB_EHCI_KIRKWOOD
-CONFIG_USB_EHCI_MXS
 CONFIG_USB_EHCI_TXFIFO_THRESH
 CONFIG_USB_ETH_QMULT
 CONFIG_USB_ETH_SUBSET
-- 
2.39.5