mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] spi: Add OF-style registration and binding
@ 2010-09-28 20:47 Sinan Akman
  2010-09-29  8:14 ` Grant Likely
  0 siblings, 1 reply; 2+ messages in thread
From: Sinan Akman @ 2010-09-28 20:47 UTC (permalink / raw)
  To: linux-kernel; +Cc: grant.likely, avorontsov, sinan, dbrownell

This patch adds the OF hook to the spi core so that devices
can automatically be registered based on device tree data.

Signed-off-by: Sinan Akman <sinan@writeme.com>
---
 drivers/spi/spi.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 0bcf4c1..b5a78a1 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/cache.h>
 #include <linux/mutex.h>
+#include <linux/of_device.h>
 #include <linux/slab.h>
 #include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
@@ -86,6 +87,10 @@ static int spi_match_device(struct device *dev, struct device_driver *drv)
 	const struct spi_device	*spi = to_spi_device(dev);
 	const struct spi_driver	*sdrv = to_spi_driver(drv);
 
+	/* Attempt an OF style match */
+	if (of_driver_match_device(dev, drv))
+		return 1;
+
 	if (sdrv->id_table)
 		return !!spi_match_id(sdrv->id_table, spi);
 
-- 
1.6.2.5


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] spi: Add OF-style registration and binding
  2010-09-28 20:47 [PATCH] spi: Add OF-style registration and binding Sinan Akman
@ 2010-09-29  8:14 ` Grant Likely
  0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2010-09-29  8:14 UTC (permalink / raw)
  To: Sinan Akman; +Cc: linux-kernel, avorontsov, dbrownell

On Tue, Sep 28, 2010 at 04:47:28PM -0400, Sinan Akman wrote:
> This patch adds the OF hook to the spi core so that devices
> can automatically be registered based on device tree data.
> 
> Signed-off-by: Sinan Akman <sinan@writeme.com>

Applied to -merge, thanks.

g.

> ---
>  drivers/spi/spi.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 0bcf4c1..b5a78a1 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -23,6 +23,7 @@
>  #include <linux/init.h>
>  #include <linux/cache.h>
>  #include <linux/mutex.h>
> +#include <linux/of_device.h>
>  #include <linux/slab.h>
>  #include <linux/mod_devicetable.h>
>  #include <linux/spi/spi.h>
> @@ -86,6 +87,10 @@ static int spi_match_device(struct device *dev, struct device_driver *drv)
>  	const struct spi_device	*spi = to_spi_device(dev);
>  	const struct spi_driver	*sdrv = to_spi_driver(drv);
>  
> +	/* Attempt an OF style match */
> +	if (of_driver_match_device(dev, drv))
> +		return 1;
> +
>  	if (sdrv->id_table)
>  		return !!spi_match_id(sdrv->id_table, spi);
>  
> -- 
> 1.6.2.5
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-09-29  8:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-28 20:47 [PATCH] spi: Add OF-style registration and binding Sinan Akman
2010-09-29  8:14 ` Grant Likely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome