mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
ec5499d338
The USB_XHCI_RZV2M and USB_RENESAS_USB3 select other drivers
based on the enabled SoC types, which leads to build failures
when the dependencies are not met:
WARNING: unmet direct dependencies detected for USB_RZV2M_USB3DRD
Depends on [n]: USB_SUPPORT [=y] && USB_GADGET [=n] && (ARCH_R9A09G011 [=n] || COMPILE_TEST [=y])
Selected by [m]:
- USB_XHCI_RZV2M [=m] && USB_SUPPORT [=y] && USB [=y] && USB_XHCI_HCD [=m] && USB_XHCI_PLATFORM [=m] && (ARCH_R9A09G011 [=n] || COMPILE_TEST [=y])
ERROR: modpost: "rzv2m_usb3drd_reset" [drivers/usb/host/xhci-plat-hcd.ko] undefined!
The xhci-rcar driver has a reverse dependency with the xhci core, and it
depends on the UDC driver in turn. To untangle this, make the xhci-rcar.ko
driver a standalone module that just calls into the xhci-plat.ko module
like other drivers do.
This allows handling the dependency on the USB_RZV2M_USB3DRD driver to
only affect the xhci-rcar module and simplify the xhci-plat module.
It also allows leaving out the hacks for broken dma mask and nested
devices from the rcar side and keep that only in the generic xhci driver.
As a future cleanup, the marvell and dwc3 specific bits of xhci-plat.c
could be moved out as well, but that is not required for this bugfix.
Fixes: c52c9acc41 ("xhci: host: Add Renesas RZ/V2M SoC support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230131150531.12347-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
88 lines
3 KiB
Makefile
88 lines
3 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Makefile for USB Host Controller Drivers
|
|
#
|
|
|
|
# tell define_trace.h where to find the xhci trace header
|
|
CFLAGS_xhci-trace.o := -I$(src)
|
|
|
|
fhci-y := fhci-hcd.o fhci-hub.o fhci-q.o
|
|
fhci-y += fhci-mem.o fhci-tds.o fhci-sched.o
|
|
|
|
fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o
|
|
|
|
xhci-hcd-y := xhci.o xhci-mem.o xhci-ext-caps.o
|
|
xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o
|
|
xhci-hcd-y += xhci-trace.o
|
|
|
|
ifneq ($(CONFIG_USB_XHCI_DBGCAP), )
|
|
xhci-hcd-y += xhci-dbgcap.o xhci-dbgtty.o
|
|
endif
|
|
|
|
xhci-mtk-hcd-y := xhci-mtk.o xhci-mtk-sch.o
|
|
|
|
xhci-plat-hcd-y := xhci-plat.o
|
|
ifneq ($(CONFIG_USB_XHCI_MVEBU), )
|
|
xhci-plat-hcd-y += xhci-mvebu.o
|
|
endif
|
|
ifneq ($(CONFIG_DEBUG_FS),)
|
|
xhci-hcd-y += xhci-debugfs.o
|
|
endif
|
|
|
|
xhci-rcar-hcd-y += xhci-rcar.o
|
|
xhci-rcar-hcd-$(CONFIG_USB_XHCI_RZV2M) += xhci-rzv2m.o
|
|
|
|
obj-$(CONFIG_USB_PCI) += pci-quirks.o
|
|
|
|
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
|
|
obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
|
|
obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o
|
|
obj-$(CONFIG_USB_EHCI_HCD_NPCM7XX) += ehci-npcm7xx.o
|
|
obj-$(CONFIG_USB_EHCI_HCD_OMAP) += ehci-omap.o
|
|
obj-$(CONFIG_USB_EHCI_HCD_ORION) += ehci-orion.o
|
|
obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o
|
|
obj-$(CONFIG_USB_EHCI_HCD_STI) += ehci-st.o
|
|
obj-$(CONFIG_USB_EHCI_EXYNOS) += ehci-exynos.o
|
|
obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o
|
|
obj-$(CONFIG_USB_EHCI_BRCMSTB) += ehci-brcm.o
|
|
|
|
obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
|
|
obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
|
|
obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o
|
|
|
|
obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_PCI) += ohci-pci.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_PLATFORM) += ohci-platform.o
|
|
obj-$(CONFIG_USB_OHCI_EXYNOS) += ohci-exynos.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_OMAP1) += ohci-omap.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_SPEAR) += ohci-spear.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_STI) += ohci-st.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_AT91) += ohci-at91.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_S3C2410) += ohci-s3c2410.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_LPC32XX) += ohci-nxp.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_PXA27X) += ohci-pxa27x.o
|
|
obj-$(CONFIG_USB_OHCI_HCD_DAVINCI) += ohci-da8xx.o
|
|
obj-$(CONFIG_USB_OCTEON_HCD) += octeon-hcd.o
|
|
|
|
obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o
|
|
obj-$(CONFIG_USB_FHCI_HCD) += fhci.o
|
|
obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o
|
|
obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o
|
|
obj-$(CONFIG_USB_XHCI_PCI_RENESAS) += xhci-pci-renesas.o
|
|
obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o
|
|
obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o
|
|
obj-$(CONFIG_USB_XHCI_RCAR) += xhci-rcar-hcd.o
|
|
obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk-hcd.o
|
|
obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o
|
|
obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o
|
|
obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
|
|
obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
|
|
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
|
|
obj-$(CONFIG_USB_FSL_USB2) += fsl-mph-dr-of.o
|
|
obj-$(CONFIG_USB_EHCI_FSL) += fsl-mph-dr-of.o
|
|
obj-$(CONFIG_USB_EHCI_FSL) += ehci-fsl.o
|
|
obj-$(CONFIG_USB_EHCI_MV) += ehci-mv.o
|
|
obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o
|
|
obj-$(CONFIG_USB_HCD_SSB) += ssb-hcd.o
|
|
obj-$(CONFIG_USB_MAX3421_HCD) += max3421-hcd.o
|
|
obj-$(CONFIG_USB_XEN_HCD) += xen-hcd.o
|