Commit 05212157 authored by Grant Likely's avatar Grant Likely
Browse files

drivercore/of: Add OF style matching to platform bus

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: default avatarGrant Likely <>
Acked-by: default avatarGreg Kroah-Hartman <>
CC: Michal Simek <>
CC: Grant Likely <>
CC: Benjamin Herrenschmidt <>
CC: Stephen Rothwell <>
parent 4e4f62bf
......@@ -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,7 +674,11 @@ 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);
/* match against the id table first */
/* Attempt an OF style match first */
if (of_driver_match_device(dev, drv))
return 1;
/* Then try to match against the id table */
if (pdrv->id_table)
return platform_match_id(pdrv->id_table, pdev) != NULL;
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