redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'spi-spidev' into spi-next

Browse source
This commit is contained in:
Mark Brown 2012-11-01 14:55:10 +00:00
parent 31271e9aac 8fad805bdc
commit 73b5301b02
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/spi/spidev.c
View file

@ -31,6 +31,8 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/spidev.h> #include <linux/spi/spidev.h>
@ -642,10 +644,18 @@ static int __devexit spidev_remove(struct spi_device *spi)
return 0; 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 = { static struct spi_driver spidev_spi_driver = {
.driver = { .driver = {
.name = "spidev", .name = "spidev",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(spidev_dt_ids),
}, },
.probe = spidev_probe, .probe = spidev_probe,
.remove = __devexit_p(spidev_remove), .remove = __devexit_p(spidev_remove),