diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-12-06 13:58:31 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-06 13:58:31 +0000 |
| commit | a34fc82e234255b657e62c3ce0c12e9439a59e80 (patch) | |
| tree | a305e3c3c271bb5d6cd7980780f39938a02e32ce /drivers/spi/spidev.c | |
| parent | 161b96c383c442f4d7dabbb8500a5fbd551b344d (diff) | |
| parent | 227c4ce6eac9fe6566d9718546a0e31b5b4633cd (diff) | |
Merge branch 'spi-next' from git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git
Pull in the changes Mark has queued up for SPI
Diffstat (limited to 'drivers/spi/spidev.c')
| -rw-r--r-- | drivers/spi/spidev.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 830adbed1d7..e44abc96cd0 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -31,6 +31,8 @@ #include <linux/mutex.h> #include <linux/slab.h> #include <linux/compat.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/spi/spi.h> #include <linux/spi/spidev.h> @@ -642,10 +644,18 @@ static int __devexit spidev_remove(struct spi_device *spi) return 0; } +static const struct of_device_id spidev_dt_ids[] = { + { .compatible = "rohm,dh2228fv" }, + {}, +}; + +MODULE_DEVICE_TABLE(of, spidev_dt_ids); + static struct spi_driver spidev_spi_driver = { .driver = { .name = "spidev", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(spidev_dt_ids), }, .probe = spidev_probe, .remove = __devexit_p(spidev_remove), |