]> git.ipfire.org Git - people/ms/linux.git/commitdiff
musb: fix USB_MUSB_TUSB6010 dependency
authorArnd Bergmann <arnd@arndb.de>
Thu, 18 Aug 2022 13:57:20 +0000 (15:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Aug 2022 14:33:06 +0000 (16:33 +0200)
Turning on NOP_USB_XCEIV as builtin broke the TUSB6010 driver because
of an older issue with the depencency.

It is not necessary to forbid NOP_USB_XCEIV=y in combination with
USB_MUSB_HDRC=m, but only the reverse, which causes the link failure
from the original Kconfig change.

Use the correct dependency to still allow NOP_USB_XCEIV=n or
NOP_USB_XCEIV=y but forbid NOP_USB_XCEIV=m when USB_MUSB_HDRC=m
to fix the multi_v7_defconfig for tusb.

Fixes: ab37a7a890c1 ("ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in")
Fixes: c0442479652b ("usb: musb: Fix randconfig build issues for Kconfig options")
Cc: stable <stable@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20220818135737.3143895-10-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/musb/Kconfig

index f906dfd360d37c223a6d38f54740cdd8166c61ed..6c8f7763e75e49799a14d603e0582f3067dc2a98 100644 (file)
@@ -86,7 +86,7 @@ config USB_MUSB_TUSB6010
        tristate "TUSB6010"
        depends on HAS_IOMEM
        depends on ARCH_OMAP2PLUS || COMPILE_TEST
-       depends on NOP_USB_XCEIV = USB_MUSB_HDRC # both built-in or both modules
+       depends on NOP_USB_XCEIV!=m || USB_MUSB_HDRC=m
 
 config USB_MUSB_OMAP2PLUS
        tristate "OMAP2430 and onwards"