|
@@ -17,6 +17,8 @@
|
|
#include <linux/workqueue.h>
|
|
#include <linux/workqueue.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/pm.h>
|
|
#include <linux/pm.h>
|
|
|
|
+#include <linux/of.h>
|
|
|
|
+#include <linux/of_platform.h>
|
|
|
|
|
|
#include "lis3lv02d.h"
|
|
#include "lis3lv02d.h"
|
|
|
|
|
|
@@ -58,6 +60,14 @@ static int lis3_spi_init(struct lis3lv02d *lis3)
|
|
static union axis_conversion lis3lv02d_axis_normal =
|
|
static union axis_conversion lis3lv02d_axis_normal =
|
|
{ .as_array = { 1, 2, 3 } };
|
|
{ .as_array = { 1, 2, 3 } };
|
|
|
|
|
|
|
|
+#ifdef CONFIG_OF
|
|
|
|
+static struct of_device_id lis302dl_spi_dt_ids[] = {
|
|
|
|
+ { .compatible = "st,lis302dl-spi" },
|
|
|
|
+ {}
|
|
|
|
+};
|
|
|
|
+MODULE_DEVICE_TABLE(of, lis302dl_spi_dt_ids);
|
|
|
|
+#endif
|
|
|
|
+
|
|
static int __devinit lis302dl_spi_probe(struct spi_device *spi)
|
|
static int __devinit lis302dl_spi_probe(struct spi_device *spi)
|
|
{
|
|
{
|
|
int ret;
|
|
int ret;
|
|
@@ -75,6 +85,12 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
|
|
lis3_dev.irq = spi->irq;
|
|
lis3_dev.irq = spi->irq;
|
|
lis3_dev.ac = lis3lv02d_axis_normal;
|
|
lis3_dev.ac = lis3lv02d_axis_normal;
|
|
lis3_dev.pdata = spi->dev.platform_data;
|
|
lis3_dev.pdata = spi->dev.platform_data;
|
|
|
|
+
|
|
|
|
+#ifdef CONFIG_OF
|
|
|
|
+ if (of_match_device(lis302dl_spi_dt_ids, &spi->dev))
|
|
|
|
+ lis3_dev.of_node = spi->dev.of_node;
|
|
|
|
+#endif
|
|
|
|
+
|
|
spi_set_drvdata(spi, &lis3_dev);
|
|
spi_set_drvdata(spi, &lis3_dev);
|
|
|
|
|
|
return lis3lv02d_init_device(&lis3_dev);
|
|
return lis3lv02d_init_device(&lis3_dev);
|
|
@@ -121,6 +137,7 @@ static struct spi_driver lis302dl_spi_driver = {
|
|
.name = DRV_NAME,
|
|
.name = DRV_NAME,
|
|
.owner = THIS_MODULE,
|
|
.owner = THIS_MODULE,
|
|
.pm = &lis3lv02d_spi_pm,
|
|
.pm = &lis3lv02d_spi_pm,
|
|
|
|
+ .of_match_table = of_match_ptr(lis302dl_spi_dt_ids),
|
|
},
|
|
},
|
|
.probe = lis302dl_spi_probe,
|
|
.probe = lis302dl_spi_probe,
|
|
.remove = __devexit_p(lis302dl_spi_remove),
|
|
.remove = __devexit_p(lis302dl_spi_remove),
|