On Wed, Jul 21, 2010 at 05:39:54PM -0600, Grant Likely wrote:
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.lik...@secretlab.ca
CC: Greg Kroah-Hartman gre...@suse.de
CC: Michal Simek mon...@monstr.eu
CC: Grant Likely grant.lik...@secretlab.ca
CC: Benjamin Herrenschmidt b...@kernel.crashing.org
CC: Stephen Rothwell s...@canb.auug.org.au
CC: linux-ker...@vger.kernel.org
CC: microblaze-ucli...@itee.uq.edu.au
CC: linuxppc-...@ozlabs.org
CC: devicetree-disc...@lists.ozlabs.org
---
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 */
I think you need to also change this comment, you can't have two
firsts :)
If you do that, feel free to add an:
Acked-by: Greg Kroah-Hartman gre...@suse.de
to the patch.
thanks,
greg k-h
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
