On Tue, Sep 11, 2018 at 06:06:08PM +0300, Laurent Pinchart wrote:
> The omap-usb-host driver uses platform_driver_probe() in the fs initcall
> level to ensure that the devices get probed before the EHCI and OHCI
> drivers arer probed.
>
> The EHCI and OHCI devices are created and registered by the omap-usb-host
> driver, and if no driver is present yet to handle them they will
> patiently wait for they turn without any adverse effect. This mechanism
> is thus not needed, remove it.
>
> This fixes a bug that prevents EHCI and OHCI devices from being probed
> on the Pandaboard since commit 84badc5ec5fc ("ARM: dts: omap4: Move l4
> child devices to probe them with ti-sysc"), as then omap-usb-host
> devices are now registered after the omap-usb-host driver initializes,
> and thus fail to probe due to platform_driver_probe() not finding any
> device.
>
> Fixes: 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe them
> with ti-sysc")
> Signed-off-by: Laurent Pinchart <[email protected]>
> ---
> drivers/mfd/omap-usb-host.c | 24 ++++--------------------
> 1 file changed, 4 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index e11ab12fbdf2..b731026541f5 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -548,6 +548,7 @@ static int usbhs_omap_probe(struct platform_device *pdev)
> int i;
> bool need_logic_fck;
>
> + dev_info(&pdev->dev, "%s\n", __func__);
Is it indentional? Seems like debug leftover.
> if (dev->of_node) {
> /* For DT boot we populate platform data from OF node */
> pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> @@ -855,31 +856,14 @@ static struct platform_driver usbhs_omap_driver = {
> .pm = &usbhsomap_dev_pm_ops,
> .of_match_table = usbhs_omap_dt_ids,
> },
> + .probe = usbhs_omap_probe,
> .remove = usbhs_omap_remove,
> };
>
> +module_platform_driver(usbhs_omap_driver);
> +
> MODULE_AUTHOR("Keshava Munegowda <[email protected]>");
> MODULE_AUTHOR("Roger Quadros <[email protected]>");
> MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
> MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI");
> -
> -static int __init omap_usbhs_drvinit(void)
> -{
> - return platform_driver_probe(&usbhs_omap_driver, usbhs_omap_probe);
> -}
> -
> -/*
> - * init before ehci and ohci drivers;
> - * The usbhs core driver should be initialized much before
> - * the omap ehci and ohci probe functions are called.
> - * This usbhs core driver should be initialized after
> - * usb tll driver
> - */
> -fs_initcall_sync(omap_usbhs_drvinit);
> -
> -static void __exit omap_usbhs_drvexit(void)
> -{
> - platform_driver_unregister(&usbhs_omap_driver);
> -}
> -module_exit(omap_usbhs_drvexit);
> --
> Regards,
>
> Laurent Pinchart
