From: Marek Behún
In preparation for moving this option to Kconfig, rename it to be
consistent with other USB EHCI Kconfig options.
Signed-off-by: Marek Behún
---
arch/arm/mach-kirkwood/include/mach/config.h | 2 +-
drivers/usb/host/ehci-hcd.c | 2 +-
include/configs/clearfog.h | 2 +-
include/configs/controlcenterdc.h| 2 +-
include/configs/crs3xx-98dx3236.h| 2 +-
include/configs/db-88f6720.h | 2 +-
include/configs/db-88f6820-amc.h | 2 +-
include/configs/db-88f6820-gp.h | 2 +-
include/configs/db-mv784mp-gp.h | 2 +-
include/configs/db-xc3-24g4xg.h | 2 +-
include/configs/ds414.h | 2 +-
include/configs/helios4.h| 2 +-
include/configs/mxs.h| 2 +-
include/configs/nas220.h | 2 +-
include/configs/tegra114-common.h| 2 +-
include/configs/tegra124-common.h| 2 +-
include/configs/tegra20-common.h | 2 +-
include/configs/tegra210-common.h| 2 +-
include/configs/tegra30-common.h | 2 +-
include/configs/theadorable.h| 2 +-
include/configs/tplink_wdr4300.h | 2 +-
include/configs/turris_omnia.h | 2 +-
include/configs/x530.h | 2 +-
include/configs/zynq-common.h| 2 +-
scripts/config_whitelist.txt | 2 +-
25 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h
b/arch/arm/mach-kirkwood/include/mach/config.h
index 9002e26d75..f262d70b14 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -66,7 +66,7 @@
* USB/EHCI
*/
#ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
#endif /* CONFIG_CMD_USB */
/*
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index ba75c27d04..e6355263cb 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -108,7 +108,7 @@ static struct descriptor {
},
};
-#if defined(CONFIG_EHCI_IS_TDI)
+#if defined(CONFIG_USB_EHCI_IS_TDI)
#define ehci_is_TDI() (1)
#else
#define ehci_is_TDI() (0)
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 705217067b..a12e1582d6 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -19,7 +19,7 @@
*/
/* USB/EHCI configuration */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
#define CONFIG_ENV_MIN_ENTRIES 128
diff --git a/include/configs/controlcenterdc.h
b/include/configs/controlcenterdc.h
index efd04c6fb8..12e9b8d06d 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -28,7 +28,7 @@
CONFIG_SYS_SCSI_MAX_LUN)
/* USB/EHCI configuration */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
/* Environment in SPI NOR flash */
diff --git a/include/configs/crs3xx-98dx3236.h
b/include/configs/crs3xx-98dx3236.h
index 3feaa60eda..5300467a76 100644
--- a/include/configs/crs3xx-98dx3236.h
+++ b/include/configs/crs3xx-98dx3236.h
@@ -14,7 +14,7 @@
#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
/* USB/EHCI configuration */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
/* Environment in SPI NOR flash */
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index 95f5cf0056..76c02f6656 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -20,7 +20,7 @@
#define CONFIG_I2C_MVTWSI_BASE0MVEBU_TWSI_BASE
/* USB/EHCI configuration */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
/* Environment in SPI NOR flash */
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index 41216b8b4f..c5f0a1d2e0 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -11,7 +11,7 @@
*/
/* USB/EHCI configuration */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
/* Environment in SPI NOR flash */
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 6bae063ae4..ecda30bab5 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -23,7 +23,7 @@
CONFIG_SYS_SCSI_MAX_LUN)
/* USB/EHCI configuration */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
/* Environment in SPI NOR flash */
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 48471993b8..defe480613 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -21,7 +21,7 @@
#define CONFIG_I2C_MVTWSI_BASE0MVEBU_TWSI_BASE
/* USB/EHCI configuration */
-#define CONFIG_EHCI_IS
