Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") left some
references to the config USB_OHCI_SH in ./arch/sh/ around, expecting those
to be removed with the whole SH architecture deletion.
As that did not happen, do minor clean-up instead and remove the references
to the removed config USB_OHCI_SH instead.
Signed-off-by: Lukas Bulwahn <[email protected]>
---
Christoph, please ack.
SH architecture maintainers, please pick this minor clean-up patch.
arch/sh/Kconfig | 4 ----
arch/sh/configs/sh7757lcr_defconfig | 1 -
2 files changed, 5 deletions(-)
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 0665ac0add0b..b95a5ed604d6 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -326,7 +326,6 @@ config CPU_SUBTYPE_SH7720
select CPU_SH3
select CPU_HAS_DSP
select SYS_SUPPORTS_SH_CMT
- select USB_OHCI_SH if USB_OHCI_HCD
select PINCTRL
help
Select SH7720 if you have a SH3-DSP SH7720 CPU.
@@ -336,7 +335,6 @@ config CPU_SUBTYPE_SH7721
select CPU_SH3
select CPU_HAS_DSP
select SYS_SUPPORTS_SH_CMT
- select USB_OHCI_SH if USB_OHCI_HCD
help
Select SH7721 if you have a SH3-DSP SH7721 CPU.
@@ -425,7 +423,6 @@ config CPU_SUBTYPE_SH7757
config CPU_SUBTYPE_SH7763
bool "Support SH7763 processor"
select CPU_SH4A
- select USB_OHCI_SH if USB_OHCI_HCD
help
Select SH7763 if you have a SH4A SH7763(R5S77631) CPU.
@@ -451,7 +448,6 @@ config CPU_SUBTYPE_SH7786
select CPU_SHX3
select CPU_HAS_PTEAEX
select GENERIC_CLOCKEVENTS_BROADCAST if SMP
- select USB_OHCI_SH if USB_OHCI_HCD
select USB_EHCI_SH if USB_EHCI_HCD
select PINCTRL
diff --git a/arch/sh/configs/sh7757lcr_defconfig b/arch/sh/configs/sh7757lcr_defconfig
index f10fb730b6f4..cd404818e33f 100644
--- a/arch/sh/configs/sh7757lcr_defconfig
+++ b/arch/sh/configs/sh7757lcr_defconfig
@@ -58,7 +58,6 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_SH=y
CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_SH=y
CONFIG_USB_STORAGE=y
CONFIG_MMC=y
CONFIG_MMC_SDHI=y
--
2.17.1
Hi Lukas,
On Tue, Mar 7, 2023 at 9:02 AM Lukas Bulwahn <[email protected]> wrote:
> Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") left some
> references to the config USB_OHCI_SH in ./arch/sh/ around, expecting those
> to be removed with the whole SH architecture deletion.
>
> As that did not happen, do minor clean-up instead and remove the references
> to the removed config USB_OHCI_SH instead.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>
Thanks for your patch!
> --- a/arch/sh/Kconfig
> +++ b/arch/sh/Kconfig
> @@ -326,7 +326,6 @@ config CPU_SUBTYPE_SH7720
> select CPU_SH3
> select CPU_HAS_DSP
> select SYS_SUPPORTS_SH_CMT
> - select USB_OHCI_SH if USB_OHCI_HCD
Shouldn't this select USB_OHCI_HCD_PLATFORM instead, as the (now
removed) Kconfig help text for USB_OHCI_SH used to say?
+ select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
I completely forgot I already made that comment before, cfr.
https://lore.kernel.org/all/CAMuHMdVM3BpvVD3c4gp1OidnwF5zFd4MJecij7zWBnahzNaSNw@mail.gmail.com
The same is true for the three selects below.
As USB is now broken, the proper solution will need
Fixes: 4f6dfc2136fb2e8d ("usb: remove the dead USB_OHCI_SH option")
> select PINCTRL
> help
> Select SH7720 if you have a SH3-DSP SH7720 CPU.
> @@ -336,7 +335,6 @@ config CPU_SUBTYPE_SH7721
> select CPU_SH3
> select CPU_HAS_DSP
> select SYS_SUPPORTS_SH_CMT
> - select USB_OHCI_SH if USB_OHCI_HCD
> help
> Select SH7721 if you have a SH3-DSP SH7721 CPU.
>
> @@ -425,7 +423,6 @@ config CPU_SUBTYPE_SH7757
> config CPU_SUBTYPE_SH7763
> bool "Support SH7763 processor"
> select CPU_SH4A
> - select USB_OHCI_SH if USB_OHCI_HCD
> help
> Select SH7763 if you have a SH4A SH7763(R5S77631) CPU.
>
> @@ -451,7 +448,6 @@ config CPU_SUBTYPE_SH7786
> select CPU_SHX3
> select CPU_HAS_PTEAEX
> select GENERIC_CLOCKEVENTS_BROADCAST if SMP
> - select USB_OHCI_SH if USB_OHCI_HCD
> select USB_EHCI_SH if USB_EHCI_HCD
> select PINCTRL
>
> diff --git a/arch/sh/configs/sh7757lcr_defconfig b/arch/sh/configs/sh7757lcr_defconfig
> index f10fb730b6f4..cd404818e33f 100644
> --- a/arch/sh/configs/sh7757lcr_defconfig
> +++ b/arch/sh/configs/sh7757lcr_defconfig
> @@ -58,7 +58,6 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_EHCI_SH=y
> CONFIG_USB_OHCI_HCD=y
> -CONFIG_USB_OHCI_SH=y
> CONFIG_USB_STORAGE=y
> CONFIG_MMC=y
> CONFIG_MMC_SDHI=y
This part is fine.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Geert!
On Tue, 2023-03-07 at 09:16 +0100, Geert Uytterhoeven wrote:
> Hi Lukas,
>
> On Tue, Mar 7, 2023 at 9:02 AM Lukas Bulwahn <[email protected]> wrote:
> > Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") left some
> > references to the config USB_OHCI_SH in ./arch/sh/ around, expecting those
> > to be removed with the whole SH architecture deletion.
> >
> > As that did not happen, do minor clean-up instead and remove the references
> > to the removed config USB_OHCI_SH instead.
> >
> > Signed-off-by: Lukas Bulwahn <[email protected]>
>
> Thanks for your patch!
>
> > --- a/arch/sh/Kconfig
> > +++ b/arch/sh/Kconfig
> > @@ -326,7 +326,6 @@ config CPU_SUBTYPE_SH7720
> > select CPU_SH3
> > select CPU_HAS_DSP
> > select SYS_SUPPORTS_SH_CMT
> > - select USB_OHCI_SH if USB_OHCI_HCD
>
> Shouldn't this select USB_OHCI_HCD_PLATFORM instead, as the (now
> removed) Kconfig help text for USB_OHCI_SH used to say?
>
> + select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
>
> I completely forgot I already made that comment before, cfr.
> https://lore.kernel.org/all/CAMuHMdVM3BpvVD3c4gp1OidnwF5zFd4MJecij7zWBnahzNaSNw@mail.gmail.com
>
> The same is true for the three selects below.
> As USB is now broken, the proper solution will need
> Fixes: 4f6dfc2136fb2e8d ("usb: remove the dead USB_OHCI_SH option")
Thanks a lot for catching this!
@Lukas: Can you send a new patch with the suggested changes?
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
On Tue, Mar 7, 2023 at 9:19 AM John Paul Adrian Glaubitz
<[email protected]> wrote:
>
> Hi Geert!
>
> On Tue, 2023-03-07 at 09:16 +0100, Geert Uytterhoeven wrote:
> > Hi Lukas,
> >
> > On Tue, Mar 7, 2023 at 9:02 AM Lukas Bulwahn <[email protected]> wrote:
> > > Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") left some
> > > references to the config USB_OHCI_SH in ./arch/sh/ around, expecting those
> > > to be removed with the whole SH architecture deletion.
> > >
> > > As that did not happen, do minor clean-up instead and remove the references
> > > to the removed config USB_OHCI_SH instead.
> > >
> > > Signed-off-by: Lukas Bulwahn <[email protected]>
> >
> > Thanks for your patch!
> >
> > > --- a/arch/sh/Kconfig
> > > +++ b/arch/sh/Kconfig
> > > @@ -326,7 +326,6 @@ config CPU_SUBTYPE_SH7720
> > > select CPU_SH3
> > > select CPU_HAS_DSP
> > > select SYS_SUPPORTS_SH_CMT
> > > - select USB_OHCI_SH if USB_OHCI_HCD
> >
> > Shouldn't this select USB_OHCI_HCD_PLATFORM instead, as the (now
> > removed) Kconfig help text for USB_OHCI_SH used to say?
> >
> > + select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
> >
> > I completely forgot I already made that comment before, cfr.
> > https://lore.kernel.org/all/CAMuHMdVM3BpvVD3c4gp1OidnwF5zFd4MJecij7zWBnahzNaSNw@mail.gmail.com
> >
> > The same is true for the three selects below.
> > As USB is now broken, the proper solution will need
> > Fixes: 4f6dfc2136fb2e8d ("usb: remove the dead USB_OHCI_SH option")
>
Well, I assumed that I am just cleaning up some minor stuff, not
fixing broken code...
With your link and explanation, Geert, I know what needs to be done. Thanks.
> Thanks a lot for catching this!
>
> @Lukas: Can you send a new patch with the suggested changes?
>
I will send a new patch in a second.
Lukas
> Adrian
>
> --
> .''`. John Paul Adrian Glaubitz
> : :' : Debian Developer
> `. `' Physicist
> `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913