| Message ID | 20220818135737.3143895-10-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a3f2fd22743fc56dd5e3896a3fbddd276df1577f |
| Headers | show |
| Series | ARM: defconfig cleanup | expand |
On Thu, Aug 18, 2022 at 03:57:20PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/usb/musb/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Want me to take this through my tree now? If so, I can, otherwise here's a: Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> for your tree. thanks, greg k-h
On Thu, Aug 18, 2022 at 4:08 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > On Thu, Aug 18, 2022 at 03:57:20PM +0200, Arnd Bergmann wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > > > 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") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/usb/musb/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Want me to take this through my tree now? Yes, please do. Thanks, Arnd
On Thu, Aug 18, 2022 at 04:27:17PM +0200, Arnd Bergmann wrote: > On Thu, Aug 18, 2022 at 4:08 PM Greg Kroah-Hartman > <gregkh@linuxfoundation.org> wrote: > > > > On Thu, Aug 18, 2022 at 03:57:20PM +0200, Arnd Bergmann wrote: > > > From: Arnd Bergmann <arnd@arndb.de> > > > > > > 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") > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > --- > > > drivers/usb/musb/Kconfig | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Want me to take this through my tree now? > > Yes, please do. Now done, thanks!
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index f906dfd360d3..6c8f7763e75e 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -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"