* [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI
@ 2021-10-09 13:27 Marek Behún
2021-10-09 13:27 ` [PATCH 2/4] Convert CONFIG_USB_EHCI_MXS to Kconfig Marek Behún
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Marek Behún @ 2021-10-09 13:27 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Marek Vasut, Stefan Roese, Marek Behún
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/4] Convert CONFIG_USB_EHCI_MXS to Kconfig
2021-10-09 13:27 [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI Marek Behún
@ 2021-10-09 13:27 ` Marek Behún
2021-10-15 18:02 ` Tom Rini
2021-10-09 13:27 ` [PATCH 3/4] Drop CONFIG_USB_EHCI_KIRKWOOD Marek Behún
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Marek Behún @ 2021-10-09 13:27 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Marek Vasut, Stefan Roese, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
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 330ac42402..4473d5177a 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -128,7 +128,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 682f597f37..7610739021 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3037,7 +3037,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.32.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/4] Drop CONFIG_USB_EHCI_KIRKWOOD
2021-10-09 13:27 [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI Marek Behún
2021-10-09 13:27 ` [PATCH 2/4] Convert CONFIG_USB_EHCI_MXS to Kconfig Marek Behún
@ 2021-10-09 13:27 ` Marek Behún
2021-10-15 18:03 ` Tom Rini
2021-10-09 13:27 ` [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig Marek Behún
2021-10-15 18:02 ` [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI Tom Rini
3 siblings, 1 reply; 10+ messages in thread
From: Marek Behún @ 2021-10-09 13:27 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Marek Vasut, Stefan Roese, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
This config option doesn't do anything.
nas220 uses USB_EHCI_MARVELL.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
include/configs/nas220.h | 1 -
scripts/config_whitelist.txt | 1 -
2 files changed, 2 deletions(-)
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index f071ee6e1c..52c55be061 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -64,7 +64,6 @@
* USB/EHCI
*/
#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */
#define CONFIG_USB_EHCI_IS_TDI
#endif /* CONFIG_CMD_USB */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7610739021..bf5f7cae74 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3036,7 +3036,6 @@ 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_TXFIFO_THRESH
CONFIG_USB_ETH_QMULT
CONFIG_USB_ETH_SUBSET
--
2.32.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
2021-10-09 13:27 [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI Marek Behún
2021-10-09 13:27 ` [PATCH 2/4] Convert CONFIG_USB_EHCI_MXS to Kconfig Marek Behún
2021-10-09 13:27 ` [PATCH 3/4] Drop CONFIG_USB_EHCI_KIRKWOOD Marek Behún
@ 2021-10-09 13:27 ` Marek Behún
2021-10-15 18:03 ` Tom Rini
2022-05-18 4:44 ` Chris Packham
2021-10-15 18:02 ` [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI Tom Rini
3 siblings, 2 replies; 10+ messages in thread
From: Marek Behún @ 2021-10-09 13:27 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Marek Vasut, Stefan Roese, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
On mvebu this is defined if and only if !ARM64.
Otherwise it is defined for boards with ARCH_MX23, ARCH_TEGRA and
ARCH_ZYNQ, and also for SOC_AR934X (tplink_wdr4300).
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
arch/arm/mach-kirkwood/include/mach/config.h | 7 -------
arch/mips/mach-ath79/Kconfig | 1 +
drivers/usb/host/Kconfig | 7 +++++++
include/configs/clearfog.h | 3 ---
include/configs/controlcenterdc.h | 3 ---
include/configs/crs3xx-98dx3236.h | 3 ---
include/configs/db-88f6720.h | 1 -
include/configs/db-88f6820-amc.h | 3 ---
include/configs/db-88f6820-gp.h | 3 ---
include/configs/db-mv784mp-gp.h | 1 -
include/configs/db-xc3-24g4xg.h | 3 ---
include/configs/ds414.h | 3 ---
include/configs/helios4.h | 3 ---
include/configs/mxs.h | 5 -----
include/configs/nas220.h | 7 -------
include/configs/tegra114-common.h | 1 -
include/configs/tegra124-common.h | 1 -
include/configs/tegra20-common.h | 1 -
include/configs/tegra210-common.h | 1 -
include/configs/tegra30-common.h | 1 -
include/configs/theadorable.h | 1 -
include/configs/tplink_wdr4300.h | 1 -
include/configs/turris_omnia.h | 3 ---
include/configs/x530.h | 3 ---
include/configs/zynq-common.h | 2 --
scripts/config_whitelist.txt | 1 -
26 files changed, 8 insertions(+), 61 deletions(-)
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index f262d70b14..cf6b1b9b63 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -62,13 +62,6 @@
#define CONFIG_RESET_PHY_R /* use reset_phy() to init mv8831116 PHY */
#endif /* CONFIG_CMD_NET */
-/*
- * USB/EHCI
- */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_IS_TDI
-#endif /* CONFIG_CMD_USB */
-
/*
* IDE Support on SATA ports
*/
diff --git a/arch/mips/mach-ath79/Kconfig b/arch/mips/mach-ath79/Kconfig
index bdb23b5765..cd85d1b6c3 100644
--- a/arch/mips/mach-ath79/Kconfig
+++ b/arch/mips/mach-ath79/Kconfig
@@ -20,6 +20,7 @@ config SOC_AR934X
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
select SUPPORTS_CPU_MIPS32_R2
+ select USB_EHCI_IS_TDI if USB_EHCI_HCD
help
This supports QCA/Atheros ar934x family SOCs.
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index be5e4b994d..ccecb5a3b0 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -139,6 +139,9 @@ config USB_EHCI_HCD
if USB_EHCI_HCD
+config USB_EHCI_IS_TDI
+ bool
+
config USB_EHCI_ATMEL
bool "Support for Atmel on-chip EHCI USB controller"
depends on ARCH_AT91
@@ -150,6 +153,7 @@ config USB_EHCI_MARVELL
bool "Support for Marvell on-chip EHCI USB controller"
depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X
default y
+ select USB_EHCI_IS_TDI if !ARM64
---help---
Enables support for the on-chip EHCI controller on MVEBU SoCs.
@@ -179,6 +183,7 @@ config USB_EHCI_MXS
bool "Support for i.MX23 EHCI USB controller"
depends on ARCH_MX23
default y
+ select USB_EHCI_IS_TDI
help
Enables support for the on-chip EHCI controller on i.MX23 SoCs.
@@ -258,12 +263,14 @@ config USB_EHCI_PCI
config USB_EHCI_TEGRA
bool "Support for NVIDIA Tegra on-chip EHCI USB controller"
depends on ARCH_TEGRA
+ select USB_EHCI_IS_TDI
---help---
Enable support for Tegra on-chip EHCI USB controller
config USB_EHCI_ZYNQ
bool "Support for Xilinx Zynq on-chip EHCI USB controller"
default y if ARCH_ZYNQ
+ select USB_EHCI_IS_TDI
---help---
Enable support for Zynq on-chip EHCI USB controller
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index a12e1582d6..a30bca5147 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -18,9 +18,6 @@
* U-Boot into it.
*/
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
#define CONFIG_ENV_MIN_ENTRIES 128
/* Environment in MMC */
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 12e9b8d06d..21e61e5e8f 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -27,9 +27,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/* Environment in SPI NOR flash */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h
index 5300467a76..27b45a7605 100644
--- a/include/configs/crs3xx-98dx3236.h
+++ b/include/configs/crs3xx-98dx3236.h
@@ -13,9 +13,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) /* 64 MB */
#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/* Environment in SPI NOR flash */
/* Keep device tree and initrd in lower memory so the kernel can access them */
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index 76c02f6656..19fc669f89 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -20,7 +20,6 @@
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* USB/EHCI configuration */
-#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 c5f0a1d2e0..1f70c609d2 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -10,9 +10,6 @@
* High Level Configuration Options (easy to change)
*/
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/* Environment in SPI NOR flash */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index ecda30bab5..41dadfebb9 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -22,9 +22,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/* Environment in SPI NOR flash */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index defe480613..dbbc33ebf9 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -21,7 +21,6 @@
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* USB/EHCI configuration */
-#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 206afae590..6a4c5a7ab5 100644
--- a/include/configs/db-xc3-24g4xg.h
+++ b/include/configs/db-xc3-24g4xg.h
@@ -12,9 +12,6 @@
#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/* Environment in SPI NOR flash */
/* NAND */
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 85abed5d3b..1f2d2c5e44 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -24,9 +24,6 @@
#define CONFIG_PCI_SCAN_SHOW
#endif
-/* USB/EHCI/XHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index 7ed70602d1..56d35d6fdb 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -18,9 +18,6 @@
* U-Boot into it.
*/
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
#define CONFIG_ENV_MIN_ENTRIES 128
/* Environment in MMC */
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 4473d5177a..f67c7306de 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -126,9 +126,4 @@
#define CONFIG_SPI_HALF_DUPLEX
#endif
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_IS_TDI
-#endif
-
#endif /* __CONFIGS_MXS_H__ */
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 52c55be061..99b14ba621 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -60,13 +60,6 @@
#define CONFIG_PHY_BASE_ADR 8
#endif /* CONFIG_CMD_NET */
-/*
- * USB/EHCI
- */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_IS_TDI
-#endif /* CONFIG_CMD_USB */
-
/*
* File system
*/
diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
index 06b687d556..0973721180 100644
--- a/include/configs/tegra114-common.h
+++ b/include/configs/tegra114-common.h
@@ -58,7 +58,6 @@
#define CONFIG_SPL_STACK 0x800ffffc
/* For USB EHCI controller */
-#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 de78ac9924..df688dabd1 100644
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -60,7 +60,6 @@
#define CONFIG_SPL_STACK 0x800ffffc
/* For USB EHCI controller */
-#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 d2bed64ccd..063213cbfe 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -78,7 +78,6 @@
* packets depending on the buffer address and size.
*/
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
-#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 6c58ccc3d5..c36bdb0bb9 100644
--- a/include/configs/tegra210-common.h
+++ b/include/configs/tegra210-common.h
@@ -47,7 +47,6 @@
"ramdisk_addr_r=0x83200000\0"
/* For USB EHCI controller */
-#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 56b2671e43..b878b1a9e6 100644
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -55,7 +55,6 @@
#define CONFIG_SPL_STACK 0x800ffffc
/* For USB EHCI controller */
-#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 073855592b..b43c03d3e8 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -29,7 +29,6 @@
#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE
/* USB/EHCI configuration */
-#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 ede94e95f7..3e76d638c9 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -41,7 +41,6 @@
/* USB, USB storage, USB ethernet */
#define CONFIG_EHCI_MMIO_BIG_ENDIAN
#define CONFIG_EHCI_DESC_BIG_ENDIAN
-#define CONFIG_USB_EHCI_IS_TDI
/*
* Diagnostics
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 4d8a7c37de..8d7d5c2bfc 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -17,9 +17,6 @@
* U-Boot into it.
*/
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/* Environment in SPI NOR flash */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
diff --git a/include/configs/x530.h b/include/configs/x530.h
index 23b1121460..f8b808ec7c 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -45,9 +45,6 @@
/* Additional FS support/configuration */
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/* Environment in SPI NOR flash */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index f3c8512641..4de2f94b04 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -55,8 +55,6 @@
#endif
#ifdef CONFIG_USB_EHCI_ZYNQ
-# define CONFIG_USB_EHCI_IS_TDI
-
# define DFU_DEFAULT_POLL_TIMEOUT 300
# define CONFIG_THOR_RESET_OFF
#endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bf5f7cae74..bbb278197c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3035,7 +3035,6 @@ 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_TXFIFO_THRESH
CONFIG_USB_ETH_QMULT
CONFIG_USB_ETH_SUBSET
--
2.32.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI
2021-10-09 13:27 [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI Marek Behún
` (2 preceding siblings ...)
2021-10-09 13:27 ` [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig Marek Behún
@ 2021-10-15 18:02 ` Tom Rini
3 siblings, 0 replies; 10+ messages in thread
From: Tom Rini @ 2021-10-15 18:02 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, Marek Vasut, Stefan Roese, Marek Behún
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
On Sat, Oct 09, 2021 at 03:27:32PM +0200, Marek Behún wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/4] Convert CONFIG_USB_EHCI_MXS to Kconfig
2021-10-09 13:27 ` [PATCH 2/4] Convert CONFIG_USB_EHCI_MXS to Kconfig Marek Behún
@ 2021-10-15 18:02 ` Tom Rini
0 siblings, 0 replies; 10+ messages in thread
From: Tom Rini @ 2021-10-15 18:02 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, Marek Vasut, Stefan Roese, Marek Behún
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
On Sat, Oct 09, 2021 at 03:27:33PM +0200, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> 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>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/4] Drop CONFIG_USB_EHCI_KIRKWOOD
2021-10-09 13:27 ` [PATCH 3/4] Drop CONFIG_USB_EHCI_KIRKWOOD Marek Behún
@ 2021-10-15 18:03 ` Tom Rini
0 siblings, 0 replies; 10+ messages in thread
From: Tom Rini @ 2021-10-15 18:03 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, Marek Vasut, Stefan Roese, Marek Behún
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
On Sat, Oct 09, 2021 at 03:27:34PM +0200, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> This config option doesn't do anything.
>
> nas220 uses USB_EHCI_MARVELL.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
2021-10-09 13:27 ` [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig Marek Behún
@ 2021-10-15 18:03 ` Tom Rini
2022-05-18 4:44 ` Chris Packham
1 sibling, 0 replies; 10+ messages in thread
From: Tom Rini @ 2021-10-15 18:03 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, Marek Vasut, Stefan Roese, Marek Behún
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
On Sat, Oct 09, 2021 at 03:27:35PM +0200, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> On mvebu this is defined if and only if !ARM64.
>
> Otherwise it is defined for boards with ARCH_MX23, ARCH_TEGRA and
> ARCH_ZYNQ, and also for SOC_AR934X (tplink_wdr4300).
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
2021-10-09 13:27 ` [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig Marek Behún
2021-10-15 18:03 ` Tom Rini
@ 2022-05-18 4:44 ` Chris Packham
2022-05-18 8:07 ` Marek Behún
1 sibling, 1 reply; 10+ messages in thread
From: Chris Packham @ 2022-05-18 4:44 UTC (permalink / raw)
To: Marek Behún
Cc: Tom Rini, u-boot, Marek Vasut, Stefan Roese, Marek Behún
Hi Marek,
On Sun, Oct 10, 2021 at 2:28 AM Marek Behún <kabel@kernel.org> wrote:
>
> From: Marek Behún <marek.behun@nic.cz>
>
> On mvebu this is defined if and only if !ARM64.
>
I'm working on a 64-bit MVEBU board which I'll hopefully be submitting
soon (just getting the Linux stuff sorted first). Was there any
particular reason you added the !ARM64 ? My board appears to need
CONFIG_USB_EHCI_IS_TDI=y. I can make the condition more complicated if
necessary but it might just be easier to remove the !ARM64.
> Otherwise it is defined for boards with ARCH_MX23, ARCH_TEGRA and
> ARCH_ZYNQ, and also for SOC_AR934X (tplink_wdr4300).
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> ---
<snip>
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index be5e4b994d..ccecb5a3b0 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -139,6 +139,9 @@ config USB_EHCI_HCD
>
> if USB_EHCI_HCD
>
> +config USB_EHCI_IS_TDI
> + bool
> +
> config USB_EHCI_ATMEL
> bool "Support for Atmel on-chip EHCI USB controller"
> depends on ARCH_AT91
> @@ -150,6 +153,7 @@ config USB_EHCI_MARVELL
> bool "Support for Marvell on-chip EHCI USB controller"
> depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X
> default y
> + select USB_EHCI_IS_TDI if !ARM64
Here I'm thinking about something like if !ARM64 || ALLEYCAT_5
> ---help---
> Enables support for the on-chip EHCI controller on MVEBU SoCs.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
2022-05-18 4:44 ` Chris Packham
@ 2022-05-18 8:07 ` Marek Behún
0 siblings, 0 replies; 10+ messages in thread
From: Marek Behún @ 2022-05-18 8:07 UTC (permalink / raw)
To: Chris Packham
Cc: Tom Rini, u-boot, Marek Vasut, Stefan Roese, Marek Behún
On Wed, 18 May 2022 16:44:32 +1200
Chris Packham <judge.packham@gmail.com> wrote:
> Hi Marek,
>
> On Sun, Oct 10, 2021 at 2:28 AM Marek Behún <kabel@kernel.org> wrote:
> >
> > From: Marek Behún <marek.behun@nic.cz>
> >
> > On mvebu this is defined if and only if !ARM64.
> >
>
> I'm working on a 64-bit MVEBU board which I'll hopefully be submitting
> soon (just getting the Linux stuff sorted first). Was there any
> particular reason you added the !ARM64 ? My board appears to need
> CONFIG_USB_EHCI_IS_TDI=y. I can make the condition more complicated if
> necessary but it might just be easier to remove the !ARM64.
It was because only arm32 boards defined it in the config headers when
I was converting. So I converted it so that Kconfig selected that if
!ARM64.
> > Otherwise it is defined for boards with ARCH_MX23, ARCH_TEGRA and
> > ARCH_ZYNQ, and also for SOC_AR934X (tplink_wdr4300).
> >
> > Signed-off-by: Marek Behún <marek.behun@nic.cz>
> > ---
>
> <snip>
>
> > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> > index be5e4b994d..ccecb5a3b0 100644
> > --- a/drivers/usb/host/Kconfig
> > +++ b/drivers/usb/host/Kconfig
> > @@ -139,6 +139,9 @@ config USB_EHCI_HCD
> >
> > if USB_EHCI_HCD
> >
> > +config USB_EHCI_IS_TDI
> > + bool
> > +
> > config USB_EHCI_ATMEL
> > bool "Support for Atmel on-chip EHCI USB controller"
> > depends on ARCH_AT91
> > @@ -150,6 +153,7 @@ config USB_EHCI_MARVELL
> > bool "Support for Marvell on-chip EHCI USB controller"
> > depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X
> > default y
> > + select USB_EHCI_IS_TDI if !ARM64
>
> Here I'm thinking about something like if !ARM64 || ALLEYCAT_5
Sure, if you need this, do this. Just make sure it does not get
selected for boards that don't need it.
Marek
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-05-18 8:07 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-09 13:27 [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI Marek Behún
2021-10-09 13:27 ` [PATCH 2/4] Convert CONFIG_USB_EHCI_MXS to Kconfig Marek Behún
2021-10-15 18:02 ` Tom Rini
2021-10-09 13:27 ` [PATCH 3/4] Drop CONFIG_USB_EHCI_KIRKWOOD Marek Behún
2021-10-15 18:03 ` Tom Rini
2021-10-09 13:27 ` [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig Marek Behún
2021-10-15 18:03 ` Tom Rini
2022-05-18 4:44 ` Chris Packham
2022-05-18 8:07 ` Marek Behún
2021-10-15 18:02 ` [PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).