diff options
author | AnilKumar Ch <anilkumar@ti.com> | 2012-09-26 16:58:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 17:18:12 -0400 |
commit | 79df8d27d9f4382647c31ef17f7402833d682b73 (patch) | |
tree | f12284988fe4161e610cb8cb1b9855bd1b201f80 /drivers/misc/lis3lv02d | |
parent | 0c83adba6b117264eb1972d2787dd17874214e9b (diff) |
drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init
Add lis3lv02d device tree initialization code/API to take pdata from
device node. Also remove CONFIG_OF ifdef from the driver, if CONFIG_OF is
not defined then OF APIs returns 0.
[akpm@linux-foundation.org: fix CONFIG_OF=n build[
Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/lis3lv02d')
-rw-r--r-- | drivers/misc/lis3lv02d/lis3lv02d_spi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c index 4b8ccf200194..ccb6475fa059 100644 --- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c +++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/pm.h> | 19 | #include <linux/pm.h> |
20 | #include <linux/of.h> | 20 | #include <linux/of.h> |
21 | #include <linux/of_platform.h> | 21 | #include <linux/of_platform.h> |
22 | #include <linux/of_device.h> | ||
22 | 23 | ||
23 | #include "lis3lv02d.h" | 24 | #include "lis3lv02d.h" |
24 | 25 | ||
@@ -87,10 +88,13 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi) | |||
87 | lis3_dev.pdata = spi->dev.platform_data; | 88 | lis3_dev.pdata = spi->dev.platform_data; |
88 | 89 | ||
89 | #ifdef CONFIG_OF | 90 | #ifdef CONFIG_OF |
90 | if (of_match_device(lis302dl_spi_dt_ids, &spi->dev)) | 91 | if (of_match_device(lis302dl_spi_dt_ids, &spi->dev)) { |
91 | lis3_dev.of_node = spi->dev.of_node; | 92 | lis3_dev.of_node = spi->dev.of_node; |
93 | ret = lis3lv02d_init_dt(&lis3_dev); | ||
94 | if (ret) | ||
95 | return ret; | ||
96 | } | ||
92 | #endif | 97 | #endif |
93 | |||
94 | spi_set_drvdata(spi, &lis3_dev); | 98 | spi_set_drvdata(spi, &lis3_dev); |
95 | 99 | ||
96 | return lis3lv02d_init_device(&lis3_dev); | 100 | return lis3lv02d_init_device(&lis3_dev); |