[PATCH 3/4] usb: remove OMAP USB Device Controller and OHCI support for OMAP1/2 chips

[Lukas Bulwahn]

On Thu, Jan 12, 2023 at 10:03 AM Arnd Bergmann <arnd at arndb.de> wrote:
>
> On Thu, Jan 12, 2023, at 09:37, Lukas Bulwahn wrote:
> > Commit 0fee2eac5c2b ("usb: phy: remove phy-isp1301-omap driver") removes
> > the Philips ISP1301 with OMAP OTG driver and its corresponding config
> > ISP1301_OMAP. The drivers, OMAP USB Device Controller and OHCI support for
> > OMAP1/2 chips, with corresponding configs, USB_OMAP and USB_OHCI_HCD_OMAP1,
> > need this removed driver (see "depends on ISP1301_OMAP") to build.
> >
> > Remove those two drivers.
> >
> > With the config USB_OMAP removed in this commit, remove some further code
> > in the omap-dma header and mach-omap1 architecture code.
> >
> > Signed-off-by: Lukas Bulwahn <lukas.bulwahn at gmail.com>
>
> This would be a great cleanup because of the simplications of the
> omap-dma code. I had previously looked at it and concluded that
> the driver is still in use though, and I think my mistake was
> just in the Kconfig part of this patch:
>
> commit c32fd10914a314dd96c5d24030200070c84df5f1
> Author: Arnd Bergmann <arnd at arndb.de>
> Date:   Thu Sep 29 15:38:56 2022 +0200
>
>     ARM: omap1: remove unused board files
>
>     All board support that was marked as 'unused' earlier can
>     now be removed, leaving the five machines that that still
>     had someone using them in 2022, or that are supported in
>     qemu.
>
>     Cc: Aaro Koskinen <aaro.koskinen at iki.fi>
>     Cc: Janusz Krzysztofik <jmkrzyszt at gmail.com>
>     Cc: Tony Lindgren <tony at atomide.com>
>     Cc: linux-omap at vger.kernel.org
>     Signed-off-by: Arnd Bergmann <arnd at arndb.de>
>
> diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
> index b3006d8b04ab..95751062078e 100644
> --- a/drivers/usb/gadget/udc/Kconfig
> +++ b/drivers/usb/gadget/udc/Kconfig
> @@ -118,7 +118,7 @@ config USB_GR_UDC
>  config USB_OMAP
>         tristate "OMAP USB Device Controller"
>         depends on ARCH_OMAP1
> -       depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3)
> +       depends on ISP1301_OMAP
>         help
>            Many Texas Instruments OMAP processors have flexible full
>            speed USB device controllers, with support for up to 30
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 0442dc4bc334..a0c14c62ff32 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -409,7 +409,7 @@ if USB_OHCI_HCD
>  config USB_OHCI_HCD_OMAP1
>         tristate "OHCI support for OMAP1/2 chips"
>         depends on ARCH_OMAP1
> -       depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3)
> +       depends on ISP1301_OMAP
>         default y
>         help
>           Enables support for the OHCI controller on OMAP1/2 chips.
>
> Instead of changing this to 'depends on ISP1301_OMAP', the line
> probably should just be dropped entirely.
>

I see. Yes, probably, !(MACH_OMAP_H2 || MACH_OMAP_H3) is really in the
current state of the repository "always true", and hence this
dependency "depends on ISP1301_OMAP || !(MACH_OMAP_H2 ||
MACH_OMAP_H3)" is always independent of  ISP1301_OMAP.

Are you going to fix up your commit "ARM: omap1: remove unused board
files" with this change?

Please ignore this patch then; patch 1 and 4 still seem good to pick, though.

Lukas