| Message ID | 20221215165728.2062984-1-arnd@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | usb: fotg210: fix OTG-only build | expand |
On Thu, Dec 15, 2022 at 5:57 PM Arnd Bergmann <arnd@kernel.org> wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The fotg210 module combines the HCD and OTG drivers, which then > fails to build when only the USB gadget support is enabled > in the kernel but host support is not: > > aarch64-linux-ld: drivers/usb/fotg210/fotg210-core.o: in function `fotg210_init': > fotg210-core.c:(.init.text+0xc): undefined reference to `usb_disabled' > > Move the check for usb_disabled() after the check for the HCD module, > and let the OTG driver still be probed in this configuration. > > A nicer approach might be to have the common portion built as a > library module, with the two platform other files registering > their own platform_driver instances separately. > > Fixes: ddacd6ef44ca ("usb: fotg210: Fix Kconfig for USB host modules") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> My mistake, I thought this function was a generic USB function and not related to host. I might just push it down to the host again. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Hi Linus, On Wed, 4 Jan 2023 at 09:14, Linus Walleij <linus.walleij@linaro.org> wrote: > > On Mon, Jan 2, 2023 at 7:10 AM Daniel Palmer <daniel@0x0f.com> wrote: > > > Maybe a little unrelated to this patch but this IP is also used on the > > MStar/SigmaStar chips > > I actually think Arnd Bergmann at one point sent me a device with > this line of chips in it. I suppose you will be upstreaming this > support? We've got some of it upstreamed already. We actually have most of these chips working now but the progress is slow because it's a hobby/spare time thing.. > The first patch in this series differentiates between > FOTG200 and FOTG210, do you mean to say there is > rather FUSBH200 as well? Ah this is real confusing. There is an FUSBH200 that I thought was the FOTG210 without the device (OTG) registers. I think they all are probably fairly close though. Here's the series that added the FUSBH200 to the kernel: https://lore.kernel.org/all/1366969040-28892-1-git-send-email-yhchen@faraday-tech.com/ > > I'm not sure how using the common EHCI driver works with the OTG part > > but if it's possible to make that work maybe my way is a better > > solution than trying to maintain this driver? > > That's a good point, do you have a pointer to your EHCI > quirk patch so I can take a look? I don't have a clean series but here are some links to the patches I needed to get something that worked with UVC cameras and ethernet dongles. There are some bits of platform garbage and working out mixed in. I can clean it up into a proper series if it's worth doing. https://github.com/linux-chenxing/linux/commit/cafda0a6588c125d93a513b3a86f26f287c68fa3 https://github.com/linux-chenxing/linux/commit/f628cc1e915b4c7beb37a33e1a255e88cc90e609 https://github.com/linux-chenxing/linux/commit/a03f6312e4cba20ae5058822ae57e94ba989475d https://github.com/linux-chenxing/linux/commit/f4f10314c23370376f2bcffa653709535775bcd8 https://github.com/linux-chenxing/linux/commit/fc8e4548b89d5c984284f5c085046be37889bc88 https://github.com/linux-chenxing/linux/commit/2a6ef17ad41a7228a13756d50ac1449862857b64 Cheers, Daniel
diff --git a/drivers/usb/fotg210/fotg210-core.c b/drivers/usb/fotg210/fotg210-core.c index 8a54edf921ac..ee740a6da463 100644 --- a/drivers/usb/fotg210/fotg210-core.c +++ b/drivers/usb/fotg210/fotg210-core.c @@ -144,10 +144,7 @@ static struct platform_driver fotg210_driver = { static int __init fotg210_init(void) { - if (usb_disabled()) - return -ENODEV; - - if (IS_ENABLED(CONFIG_USB_FOTG210_HCD)) + if (IS_ENABLED(CONFIG_USB_FOTG210_HCD) && !usb_disabled()) fotg210_hcd_init(); return platform_driver_register(&fotg210_driver); }