[PATCH v2] sh: Use generic OHCI platform provider symbol
From: Karl Mehltretter
Date: Sat Sep 05 2026 - 10:53:27 EST
From: Pengpeng Hou <pengpeng@xxxxxxxxxxx>
The old SuperH-specific `USB_OHCI_SH` provider symbol no longer carries
an OHCI provider object. The current platform OHCI provider is
`USB_OHCI_HCD_PLATFORM`, which builds ohci-platform.o.
Several SH CPU subtypes still select `USB_OHCI_SH`, and the
sh7757lcr defconfig still enables it directly. Switch both the subtype
selects and the defconfig to `USB_OHCI_HCD_PLATFORM` so the intended OHCI
provider remains reachable when `USB_OHCI_HCD` is enabled.
Fixes: 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option")
Signed-off-by: Pengpeng Hou <pengpeng@xxxxxxxxxxx>
Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
[Karl Mehltretter: rebased, added Fixes: tag]
Assisted-by: LLM
Signed-off-by: Karl Mehltretter <kmehltretter@xxxxxxxxx>
---
Resend of Pengpeng's patch from June, which Geert reviewed but which
never got applied. Geert asked for it to be picked up instead of my
"sh: Drop the selects of the removed CONFIG_USB_OHCI_SH symbol", which
is withdrawn:
https://lore.kernel.org/r/CAMuHMdWYBp0d7m0Q8rWva+EA=4nOezm1os_6ZVcrh43aPjCCPQ@xxxxxxxxxxxxxx/
Changes since v1 (https://lore.kernel.org/r/20260624081926.12426-1-pengpeng@xxxxxxxxxxx/):
- rebased on current mainline so that git am applies it
- Fixes: tag as suggested by Geert, his Reviewed-by collected
- checked with make ARCH=sh sh7757lcr_defconfig and an SH7720 config
with USB_OHCI_HCD, ohci-platform.o builds with sh4-linux-gnu-gcc
arch/sh/Kconfig | 8 ++++----
arch/sh/configs/sh7757lcr_defconfig | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index d60f1d5a94c0..f987d999126a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -331,7 +331,7 @@ 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 USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
select PINCTRL
help
Select SH7720 if you have a SH3-DSP SH7720 CPU.
@@ -341,7 +341,7 @@ config CPU_SUBTYPE_SH7721
select CPU_SH3
select CPU_HAS_DSP
select SYS_SUPPORTS_SH_CMT
- select USB_OHCI_SH if USB_OHCI_HCD
+ select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
help
Select SH7721 if you have a SH3-DSP SH7721 CPU.
@@ -426,7 +426,7 @@ config CPU_SUBTYPE_SH7757
config CPU_SUBTYPE_SH7763
bool "Support SH7763 processor"
select CPU_SH4A
- select USB_OHCI_SH if USB_OHCI_HCD
+ select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
help
Select SH7763 if you have a SH4A SH7763(R5S77631) CPU.
@@ -452,7 +452,7 @@ 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_OHCI_HCD_PLATFORM 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 93066ae429ec..ed2894784a82 100644
--- a/arch/sh/configs/sh7757lcr_defconfig
+++ b/arch/sh/configs/sh7757lcr_defconfig
@@ -58,7 +58,7 @@ 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_OHCI_HCD_PLATFORM=y
CONFIG_USB_STORAGE=y
CONFIG_MMC=y
CONFIG_MMC_SDHI=y
base-commit: 986c24e0fe44f844b44d365b71ce831947f50298
--
2.53.0