[PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI

Marek Behún
2021-10-09T13:27:53Z

From: Marek Behún <marek.behun@nic.cz>

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>
---
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_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 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_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 2c543fe12a..206afae590 100644
--- 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 58ecc5f699..85abed5d3b 100644
--- 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 b5814ed55c..7ed70602d1 100644
--- 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 b5c525dc78..330ac42402 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -129,7 +129,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 16bbc9b049..f071ee6e1c 100644
--- 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 f714c52bb5..06b687d556 100644
--- 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 4a92954c9b..de78ac9924 100644
--- 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 19934a4cf0..d2bed64ccd 100644
--- 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 b9e04147be..6c58ccc3d5 100644
--- 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 0ee13a226d..56b2671e43 100644
--- 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 64b7f25092..073855592b 100644
--- 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 f9a0b7d1aa..ede94e95f7 100644
--- 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 8646633ea4..4d8a7c37de 100644
--- 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 d6aec6d7f2..23b1121460 100644
--- 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 0c87f19ac3..f3c8512641 100644
--- 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 02d86d79cf..682f597f37 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -246,7 +246,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
@@ -3036,6 +3035,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
--
2.32.0