Commit 10492ee8 authored by Tony Lindgren's avatar Tony Lindgren Committed by Lee Jones

mfd: omap-usb-host: Fix dts probe of children

It currently only works if the parent bus uses "simple-bus". We
currently try to probe children with non-existing compatible values.
And we're missing .probe.

I noticed this while testing devices configured to probe using ti-sysc
interconnect target module driver. For that we also may want to rebind
the driver, so let's remove __init and __exit.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent a318c243
...@@ -528,8 +528,8 @@ static int usbhs_omap_get_dt_pdata(struct device *dev, ...@@ -528,8 +528,8 @@ static int usbhs_omap_get_dt_pdata(struct device *dev,
} }
static const struct of_device_id usbhs_child_match_table[] = { static const struct of_device_id usbhs_child_match_table[] = {
{ .compatible = "ti,omap-ehci", }, { .compatible = "ti,ehci-omap", },
{ .compatible = "ti,omap-ohci", }, { .compatible = "ti,ohci-omap3", },
{ } { }
}; };
...@@ -855,6 +855,7 @@ static struct platform_driver usbhs_omap_driver = { ...@@ -855,6 +855,7 @@ static struct platform_driver usbhs_omap_driver = {
.pm = &usbhsomap_dev_pm_ops, .pm = &usbhsomap_dev_pm_ops,
.of_match_table = usbhs_omap_dt_ids, .of_match_table = usbhs_omap_dt_ids,
}, },
.probe = usbhs_omap_probe,
.remove = usbhs_omap_remove, .remove = usbhs_omap_remove,
}; };
...@@ -864,9 +865,9 @@ MODULE_ALIAS("platform:" USBHS_DRIVER_NAME); ...@@ -864,9 +865,9 @@ MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI"); MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI");
static int __init omap_usbhs_drvinit(void) static int omap_usbhs_drvinit(void)
{ {
return platform_driver_probe(&usbhs_omap_driver, usbhs_omap_probe); return platform_driver_register(&usbhs_omap_driver);
} }
/* /*
...@@ -878,7 +879,7 @@ static int __init omap_usbhs_drvinit(void) ...@@ -878,7 +879,7 @@ static int __init omap_usbhs_drvinit(void)
*/ */
fs_initcall_sync(omap_usbhs_drvinit); fs_initcall_sync(omap_usbhs_drvinit);
static void __exit omap_usbhs_drvexit(void) static void omap_usbhs_drvexit(void)
{ {
platform_driver_unregister(&usbhs_omap_driver); platform_driver_unregister(&usbhs_omap_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment