As part of the merge between platform bus and of_platform bus, add the ability to do of-style matching to the platform bus. Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx> CC: Greg Kroah-Hartman <gregkh@xxxxxxx> CC: Michal Simek <monstr@xxxxxxxxx> CC: Grant Likely <grant.likely@xxxxxxxxxxxx> CC: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> CC: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> CC: linux-kernel@xxxxxxxxxxxxxxx CC: microblaze-uclinux@xxxxxxxxxxxxxx CC: linuxppc-dev@xxxxxxxxxx CC: devicetree-discuss@xxxxxxxxxxxxxxxx --- drivers/base/platform.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 4d99c8b..6a9b3dd 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -12,6 +12,7 @@ #include <linux/string.h> #include <linux/platform_device.h> +#include <linux/of_device.h> #include <linux/module.h> #include <linux/init.h> #include <linux/dma-mapping.h> @@ -673,6 +674,10 @@ static int platform_match(struct device *dev, struct device_driver *drv) struct platform_device *pdev = to_platform_device(dev); struct platform_driver *pdrv = to_platform_driver(drv); + /* Attempt an OF style match first */ + if (of_driver_match_device(dev, drv)) + return 1; + /* match against the id table first */ if (pdrv->id_table) return platform_match_id(pdrv->id_table, pdev) != NULL; -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
