aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSinan Akman <sinan@writeme.com>2010-10-02 21:28:29 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-10-02 21:28:29 -0600
commit2b7a32f7ecb24d01bd0b2d5097d7c7ebe7082ba7 (patch)
treee46d95355ecae82f6646684b83269a2dda09036c /drivers
parent23699f98f84f20195fddd0263d05a8ccb8694676 (diff)
downloadmrst-s0i3-test-2b7a32f7ecb24d01bd0b2d5097d7c7ebe7082ba7.tar.gz
mrst-s0i3-test-2b7a32f7ecb24d01bd0b2d5097d7c7ebe7082ba7.tar.xz
mrst-s0i3-test-2b7a32f7ecb24d01bd0b2d5097d7c7ebe7082ba7.zip
of/spi: Fix OF-style driver binding of spi devices
This patch adds the OF hook to the spi core so that devices can automatically be registered based on device tree data. This fixes a problem with spi devices not binding to drivers after the cleanup of the spi & i2c binding code. Signed-off-by: Sinan Akman <sinan@writeme.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 0bcf4c1601a..b5a78a1f442 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);