Revert "driver-core: platform: probe of-devices only using list of compatibles"

This reverts commit 67d02a1bbb

This should reallow binding of of-devices by name.

It turned out that there are valid reasons (e.g. step by step conversion
to device tree probing using auxdata) to bind of-instantiated devices to
drivers by name. So revert to the original logic.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
This commit is contained in:
Greg Kroah-Hartman 2016-02-15 12:52:59 -08:00
parent c21b04f989
commit 112d125a89

View File

@ -949,8 +949,8 @@ static int platform_match(struct device *dev, struct device_driver *drv)
return !strcmp(pdev->driver_override, drv->name);
/* Attempt an OF style match first */
if (pdev->dev.of_node)
return of_driver_match_device(dev, drv);
if (of_driver_match_device(dev, drv))
return 1;
/* Then try ACPI style match */
if (acpi_driver_match_device(dev, drv))