usb: gadget: fsl: Re-enable driver for ARM SoCs

Message ID 20210610030035.76864-1-joel@jms.id.au
State Superseded
Headers show
Series
  • usb: gadget: fsl: Re-enable driver for ARM SoCs
Related show

Commit Message

Joel Stanley June 10, 2021, 3 a.m.
The commit a390bef7db1f ("usb: gadget: fsl_mxc_udc: Remove the driver")
dropped the ARCH_MXC dependency from USB_FSL_USB2, leaving it depending
solely on FSL_SOC.

FSL_SOC is powerpc only; it was briefly available on ARM in 2014 with
commit cfd074ad8600 ("ARM: imx: temporarily remove CONFIG_SOC_FSL from
LS1021A"). Therefore the driver can no longer be enabled on ARM
platforms.

This appears to be a mistake as arm64's ARCH_LAERSCAPE and arm32
SOC_LS1021A SoCs use this symbol. It's enabled in these defconfigs:

arch/arm/configs/imx_v6_v7_defconfig:CONFIG_USB_FSL_USB2=y
arch/arm/configs/multi_v7_defconfig:CONFIG_USB_FSL_USB2=y
arch/powerpc/configs/mgcoge_defconfig:CONFIG_USB_FSL_USB2=y
arch/powerpc/configs/mpc512x_defconfig:CONFIG_USB_FSL_USB2=y

To fix, expand the dependencies so USB_FSL_USB2 can be enabled on the
ARM platforms, and with COMPILE_TEST.

Fixes: a390bef7db1f ("usb: gadget: fsl_mxc_udc: Remove the driver")
Signed-off-by: Joel Stanley <joel@jms.id.au>

---
 drivers/usb/gadget/udc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.30.2

Comments

Fabio Estevam June 10, 2021, 3:07 a.m. | #1
Hi Joel,

Thanks for your patch.

On Thu, Jun 10, 2021 at 12:01 AM Joel Stanley <joel@jms.id.au> wrote:
>

> The commit a390bef7db1f ("usb: gadget: fsl_mxc_udc: Remove the driver")

> dropped the ARCH_MXC dependency from USB_FSL_USB2, leaving it depending

> solely on FSL_SOC.

>

> FSL_SOC is powerpc only; it was briefly available on ARM in 2014 with

> commit cfd074ad8600 ("ARM: imx: temporarily remove CONFIG_SOC_FSL from

> LS1021A"). Therefore the driver can no longer be enabled on ARM

> platforms.

>

> This appears to be a mistake as arm64's ARCH_LAERSCAPE and arm32


Typo: ARCH_LAYERSCAPE

> SOC_LS1021A SoCs use this symbol. It's enabled in these defconfigs:

>

> arch/arm/configs/imx_v6_v7_defconfig:CONFIG_USB_FSL_USB2=y

> arch/arm/configs/multi_v7_defconfig:CONFIG_USB_FSL_USB2=y

> arch/powerpc/configs/mgcoge_defconfig:CONFIG_USB_FSL_USB2=y

> arch/powerpc/configs/mpc512x_defconfig:CONFIG_USB_FSL_USB2=y

>

> To fix, expand the dependencies so USB_FSL_USB2 can be enabled on the

> ARM platforms, and with COMPILE_TEST.

>

> Fixes: a390bef7db1f ("usb: gadget: fsl_mxc_udc: Remove the driver")

> Signed-off-by: Joel Stanley <joel@jms.id.au>

> ---

>  drivers/usb/gadget/udc/Kconfig | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig

> index 8c614bb86c66..b32cea2fb99f 100644

> --- a/drivers/usb/gadget/udc/Kconfig

> +++ b/drivers/usb/gadget/udc/Kconfig

> @@ -90,7 +90,7 @@ config USB_BCM63XX_UDC

>

>  config USB_FSL_USB2

>         tristate "Freescale Highspeed USB DR Peripheral Controller"

> -       depends on FSL_SOC

> +       depends on FSL_SOC || ARCH_LAYERSACPE || SOC_LS1021A || COMPILE_TEST


ARCH_LAYERSCAPE here too :-)

Patch

diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
index 8c614bb86c66..b32cea2fb99f 100644
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@ -90,7 +90,7 @@  config USB_BCM63XX_UDC
 
 config USB_FSL_USB2
 	tristate "Freescale Highspeed USB DR Peripheral Controller"
-	depends on FSL_SOC
+	depends on FSL_SOC || ARCH_LAYERSACPE || SOC_LS1021A || COMPILE_TEST
 	help
 	   Some of Freescale PowerPC and i.MX processors have a High Speed
 	   Dual-Role(DR) USB controller, which supports device mode.