spi: Add OF-style registration and binding
PATCH 1/1 spi: Add OF-style registration and binding
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 <[email protected]>
--- drivers/spi/spi.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/spi/spi.c +5 -0
@@ -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);
Signature · 1 line
1.6.2.5
Grant Likely
AppliedQuoted 4 lines · Sinan Akman
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 <[email protected]>
Applied to -merge, thanks.
g.
Quoted 30 lines
--- drivers/spi/spi.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)drivers/spi/spi.c +5
-0@@ -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);Signature · 1 line
1.6.2.5