Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI

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 <marek.behun@nic.cz>

diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index 9002e26d75f240b2fc6a6d307689f28995c9758e..f262d70b149ac3f4dd88da6966de912fe1c3129b 100644 (file)
--- 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 ba75c27d04ea735ff7d4a39153e2e3ce8706a15d..e6355263cb974f1815fd469615fa0093e2866157 100644 (file)
--- 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 705217067b30dc53451463710e8fc3ccadff8123..a12e1582d67ba17974634a5af96cc5eb3944b3c7 100644 (file)
--- 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 efd04c6fb8ad9852a66ae5f52b51d22840aca6c9..12e9b8d06d6ee8d96bb29783b5b20de2cf26f954 100644 (file)
--- 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 3feaa60edad8adad4a9571ad33e7b0df911548b0..5300467a766eaa41090f7654f70dce9a13598c16 100644 (file)
--- 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 95f5cf005689bd8f458d3787545da2d5bbc0292a..76c02f6656d7a4062b93452a347bf274f2ce94b0 100644 (file)
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -20,7 +20,7 @@
 #define CONFIG_I2C_MVTWSI_BASE0                MVEBU_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 41216b8b4fce10105f97e708a91db4c129de3ed6..c5f0a1d2e08dac06364c53a105a91f3c7019aac3 100644 (file)
--- 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 6bae063ae4809d41afcf53da49515b0b4b042425..ecda30bab5010fca02848323cb55a558b6edcb5b 100644 (file)
--- 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 48471993b88f6fef2238244b629688719ac25281..defe480613686bde9e8e99830117bb474c31522f 100644 (file)
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -21,7 +21,7 @@
 #define CONFIG_I2C_MVTWSI_BASE0                MVEBU_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-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h
index 2c543fe12a8055bfa88f82b9f677025ec4e583a4..206afae59014c482589d9f6d8a78d061190828bc 100644 (file)
--- a/include/configs/db-xc3-24g4xg.h
+++ b/include/configs/db-xc3-24g4xg.h
@@ -13,7 +13,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/ds414.h b/include/configs/ds414.h
index 58ecc5f699d2fc98dcc543879a48017fa6e69250..85abed5d3b512837faa02e913bd3f190bb8e9013 100644 (file)
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -25,7 +25,7 @@
 #endif
 
 /* USB/EHCI/XHCI configuration */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 
 /*
  * mv-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index b5814ed55cf240164c384f3610678acf8e289153..7ed70602d175d91386d5d96b073510b14620d30a 100644 (file)
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.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/mxs.h b/include/configs/mxs.h
index 45d176648211adda629fd0995add211131d97e45..d7d3e9d57f15f3a3c2c6d41e3a713e68d6f93379 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -124,7 +124,7 @@
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI_MXS
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 #endif
 
 #endif /* __CONFIGS_MXS_H__ */

diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 16bbc9b049f2ff22efd1a68571149dc34e994711..f071ee6e1c2606f921d882761c3cb841c2ca625d 100644 (file)
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -65,7 +65,7 @@
  */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI_KIRKWOOD       /* on Kirkwood platform */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 #endif /* CONFIG_CMD_USB */
 
 /*

diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
index f714c52bb53928d2e4ebedc27c2f150132d53f98..06b687d556366dac6f534287b68779585d579c44 100644 (file)
--- a/include/configs/tegra114-common.h
+++ b/include/configs/tegra114-common.h
@@ -58,7 +58,7 @@
 #define CONFIG_SPL_STACK               0x800ffffc
 
 /* For USB EHCI controller */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 #define CONFIG_USB_EHCI_TXFIFO_THRESH  0x10
 
 #endif /* _TEGRA114_COMMON_H_ */

diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
index 4a92954c9be8dc639257c0b7fa011da412724a3b..de78ac992411d3ab4b56fbf5c93251c96418cabe 100644 (file)
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -60,7 +60,7 @@
 #define CONFIG_SPL_STACK               0x800ffffc
 
 /* For USB EHCI controller */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 #define CONFIG_USB_EHCI_TXFIFO_THRESH  0x10
 
 /* GPU needs setup */

diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 19934a4cf0b33bb84cf1340d22614739bea77a5b..d2bed64ccdc63734bc67b715670022260fe247b3 100644 (file)
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -78,7 +78,7 @@
  * packets depending on the buffer address and size.
  */
 #define CONFIG_USB_EHCI_TXFIFO_THRESH  0x10
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 
 #define CONFIG_SYS_NAND_SELF_INIT
 

diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
index b9e04147be3048cee9545e1151713db784b0771f..6c58ccc3d5a5f0a2d94853efbe83a28c0d2be69b 100644 (file)
--- a/include/configs/tegra210-common.h
+++ b/include/configs/tegra210-common.h
@@ -47,7 +47,7 @@
        "ramdisk_addr_r=0x83200000\0"
 
 /* For USB EHCI controller */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 #define CONFIG_USB_EHCI_TXFIFO_THRESH  0x10
 
 /* GPU needs setup */

diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
index 0ee13a226d948c5622267442ccfd1639504eacb2..56b2671e43af306f3019cedd930f7959e9edad5b 100644 (file)
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -55,7 +55,7 @@
 #define CONFIG_SPL_STACK               0x800ffffc
 
 /* For USB EHCI controller */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 #define CONFIG_USB_EHCI_TXFIFO_THRESH  0x10
 
 #endif /* _TEGRA30_COMMON_H_ */

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 64b7f2509201692f7627cfe4c129677b23251e92..073855592b1ec8170ece2daaf39b36d84ea73aff 100644 (file)
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -29,7 +29,7 @@
 #define CONFIG_I2C_MVTWSI_BASE1                MVEBU_TWSI1_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/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index f9a0b7d1aaa89326407cf895f15eccdd3a36a28f..ede94e95f762d18c7628363fa1e472a86620dbe4 100644 (file)
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -41,7 +41,7 @@
 /* USB, USB storage, USB ethernet */
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_EHCI_DESC_BIG_ENDIAN
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 
 /*
  * Diagnostics

diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 8646633ea4c5a158f3e3228528ffc93ad2e77166..4d8a7c37dec35c162b2a56856f335a5e423eef14 100644 (file)
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -18,7 +18,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/x530.h b/include/configs/x530.h
index d6aec6d7f2553a5481bf6b7e995d5717d61ad44d..23b1121460e33e97edbafa0441e614bc0045a7c3 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -46,7 +46,7 @@
 /* Additional FS support/configuration */
 
 /* USB/EHCI configuration */
-#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_EHCI_IS_TDI
 
 /* Environment in SPI NOR flash */
 

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 0c87f19ac3667c798a3b2f84fb87324087c18c82..f3c851264163304dbf87a24ca021eda929652e11 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -55,7 +55,7 @@
 #endif
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
-# define CONFIG_EHCI_IS_TDI
+# define CONFIG_USB_EHCI_IS_TDI
 
 # define DFU_DEFAULT_POLL_TIMEOUT      300
 # define CONFIG_THOR_RESET_OFF

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 21c0e70e02dff04b467b4ac30795d5573ace17de..de592646b293c681deede092a44f57d7869d5ec1 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -241,7 +241,6 @@ CONFIG_EDB93XX_SDCS3
 CONFIG_EFLASH_PROTSECTORS
 CONFIG_EHCI_DESC_BIG_ENDIAN
 CONFIG_EHCI_HCD_INIT_AFTER_RESET
-CONFIG_EHCI_IS_TDI
 CONFIG_EHCI_MMIO_BIG_ENDIAN
 CONFIG_EHCI_MXS_PORT0
 CONFIG_EHCI_MXS_PORT1
@@ -3014,6 +3013,7 @@ CONFIG_USB_EHCI_BASE
 CONFIG_USB_EHCI_BASE_LIST
 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