Skip to contentSkip to conversation

ARM: multi_v7_defconfig: Stop using deprecated USB_EHCI_TEGRA

PATCH In review Dmitry Osipenko 2 participants 3 messages Mar 20, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: multi_v7_defconfig: Stop using deprecated USB_EHCI_TEGRA

The USB_EHCI_TEGRA option is deprecated now and replaced by USB_CHIPIDEA_TEGRA. Replace USB_EHCI_TEGRA with USB_CHIPIDEA_TEGRA in multi_v7_defconfig.

---
 arch/arm/configs/multi_v7_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +1 -1
index 3823da605430..d3242264514e 100644
@@ -791,7 +791,6 @@ CONFIG_USB_XHCI_MVEBU=y
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_STI=y
-CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_EHCI_EXYNOS=m
 CONFIG_USB_EHCI_MV=m
 CONFIG_USB_OHCI_HCD=y
@@ -817,6 +816,7 @@ CONFIG_USB_DWC2=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_TEGRA=y
 CONFIG_USB_ISP1760=y
 CONFIG_USB_HSIC_USB3503=y
 CONFIG_AB8500_USB=y
Signature · 1 line
2.30.2
#1 lore raw

PATCH 2/2 usb: host: ehci-tegra: Select USB_GADGET Kconfig option

Select USB_GADGET Kconfig option in order to fix build failure which happens because ChipIdea driver has a build dependency on both USB_GADGET and USB_EHCI_HCD, while USB_EHCI_TEGRA force-selects the ChipIdea driver without taking into account the tristate USB_GADGET dependency. It's not possible to do anything about the cyclic dependency of the Kconfig options, but USB_EHCI_TEGRA is now a deprecated option that isn't used by defconfigs and USB_GADGET is wanted on Tegra by default, hence it's okay to have a bit clunky workaround for it.

Fixes c3590c7656fb ("usb: host: ehci-tegra: Remove the driver")
---
 drivers/usb/host/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/usb/host/Kconfig +1 -0
index b94f2a070c05..df9428f1dc5e 100644
@@ -272,6 +272,7 @@ config USB_EHCI_TEGRA
 	select USB_CHIPIDEA
 	select USB_CHIPIDEA_HOST
 	select USB_CHIPIDEA_TEGRA
+	select USB_GADGET
 	help
 	  This option is deprecated now and the driver was removed, use
 	  USB_CHIPIDEA_TEGRA instead.
Signature · 1 line
2.30.2
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH v1 2/2] usb: host: ehci-tegra: Select USB_GADGET Kconfig option

Quoted 9 lines · Dmitry Osipenko

Select USB_GADGET Kconfig option in order to fix build failure which happens because ChipIdea driver has a build dependency on both USB_GADGET and USB_EHCI_HCD, while USB_EHCI_TEGRA force-selects the ChipIdea driver without taking into account the tristate USB_GADGET dependency. It's not possible to do anything about the cyclic dependency of the Kconfig options, but USB_EHCI_TEGRA is now a deprecated option that isn't used by defconfigs and USB_GADGET is wanted on Tegra by default, hence it's okay to have a bit clunky workaround for it.

Quoted 3 lines
Fixes c3590c7656fb ("usb: host: ehci-tegra: Remove the driver")
Quoted 19 lines
---
 drivers/usb/host/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/usb/host/Kconfig +1 -0
index b94f2a070c05..df9428f1dc5e 100644
@@ -272,6 +272,7 @@ config USB_EHCI_TEGRA
 	select USB_CHIPIDEA
 	select USB_CHIPIDEA_HOST
 	select USB_CHIPIDEA_TEGRA
+	select USB_GADGET
 	help
 	  This option is deprecated now and the driver was removed, use
 	  USB_CHIPIDEA_TEGRA instead.
Signature · 1 line
2.30.2