From: AnilKumar Ch <anilkumar@ti.com>
To: arnd@arndb.de
Cc: gregkh@linuxfoundation.org, eric.piel@tremplin-utc.net,
jic23@cam.ac.uk, greg@kroah.com, akpm@linux-foundation.org,
broonie@opensource.wolfsonmicro.com, dmitry.torokhov@gmail.com,
tony@atomide.com, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org, grant.likely@secretlab.ca,
AnilKumar Ch <anilkumar@ti.com>
Subject: [PATCH v3 3/4] lis3: lis3lv02d_i2c: Add lis3lv02d device tree init
Date: Mon, 17 Sep 2012 12:53:21 +0530 [thread overview]
Message-ID: <1347866602-2088-4-git-send-email-anilkumar@ti.com> (raw)
In-Reply-To: <1347866602-2088-1-git-send-email-anilkumar@ti.com>
Add lis3lv02d device tree initialization code/API to take pdata
from device node. Also adds device tree init matching table
support to lis3lv02d_i2c driver. If the driver data is passed
from device tree, then this driver picks up platform data
from device node through common/generic lis3lv02d.c driver.
Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
---
Documentation/devicetree/bindings/misc/lis302.txt | 36 +++++++++++++++++++++
drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 18 +++++++++++
2 files changed, 54 insertions(+)
diff --git a/Documentation/devicetree/bindings/misc/lis302.txt b/Documentation/devicetree/bindings/misc/lis302.txt
index e18af9d..6def86f 100644
--- a/Documentation/devicetree/bindings/misc/lis302.txt
+++ b/Documentation/devicetree/bindings/misc/lis302.txt
@@ -11,6 +11,12 @@ Required properties for the SPI bindings:
constrained by external circuitry
- interrupts: the interrupt generated by the device
+Required properties for the I2C bindings:
+ - compatible: should be set to "st,lis3lv02d"
+ - reg: i2c slave address
+ - Vdd-supply: The input supply for Vdd
+ - Vdd_IO-supply: The input supply for Vdd_IO
+
Optional properties for all bus drivers:
@@ -74,3 +80,33 @@ Example for a SPI device node:
st,wakeup-z-hi;
};
+Example for a I2C device node:
+
+ lis331dlh: lis331dlh@18 {
+ compatible = "st,lis331dlh", "st,lis3lv02d";
+ reg = <0x18>;
+ Vdd-supply = <&lis3_reg>;
+ Vdd_IO-supply = <&lis3_reg>;
+
+ st,click-single-x;
+ st,click-single-y;
+ st,click-single-z;
+ st,click-thresh-x = <10>;
+ st,click-thresh-y = <10>;
+ st,click-thresh-z = <10>;
+ st,irq1-click;
+ st,irq2-click;
+ st,wakeup-x-lo;
+ st,wakeup-x-hi;
+ st,wakeup-y-lo;
+ st,wakeup-y-hi;
+ st,wakeup-z-lo;
+ st,wakeup-z-hi;
+ st,min-limit-x = <120>;
+ st,min-limit-y = <120>;
+ st,min-limit-z = <140>;
+ st,max-limit-x = <550>;
+ st,max-limit-y = <550>;
+ st,max-limit-z = <750>;
+ };
+
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
index 15255eb..43e3f29 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
@@ -31,6 +31,9 @@
#include <linux/i2c.h>
#include <linux/pm_runtime.h>
#include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+
#include "lis3lv02d.h"
#define DRV_NAME "lis3lv02d_i2c"
@@ -102,12 +105,26 @@ static int lis3_i2c_init(struct lis3lv02d *lis3)
static union axis_conversion lis3lv02d_axis_map =
{ .as_array = { LIS3_DEV_X, LIS3_DEV_Y, LIS3_DEV_Z } };
+static struct of_device_id lis3lv02d_i2c_dt_ids[] = {
+ { .compatible = "st,lis3lv02d" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, lis3lv02d_i2c_dt_ids);
+
static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret = 0;
struct lis3lv02d_platform_data *pdata = client->dev.platform_data;
+ if (of_match_device(lis3lv02d_i2c_dt_ids, &client->dev)) {
+ lis3_dev.of_node = client->dev.of_node;
+ ret = lis3lv02d_init_dt(&lis3_dev);
+ if (ret)
+ return ret;
+ pdata = lis3_dev.pdata;
+ }
+
if (pdata) {
if ((pdata->driver_features & LIS3_USE_BLOCK_READ) &&
(i2c_check_functionality(client->adapter,
@@ -255,6 +272,7 @@ static struct i2c_driver lis3lv02d_i2c_driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
.pm = &lis3_pm_ops,
+ .of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids),
},
.probe = lis3lv02d_i2c_probe,
.remove = __devexit_p(lis3lv02d_i2c_remove),
--
1.7.9.5
next prev parent reply other threads:[~2012-09-17 7:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 7:23 [PATCH v3 0/4] lis3: lis3lv02d_i2c: Add device tree support AnilKumar Ch
2012-09-17 7:23 ` [PATCH v3 1/4] lis3: lis3lv02d: remove lis3lv02d driver DT init AnilKumar Ch
2012-09-17 7:23 ` [PATCH v3 2/4] lis3: lis3lv02d_spi: Add lis3lv02d device tree init AnilKumar Ch
2012-09-17 7:23 ` AnilKumar Ch [this message]
2012-09-17 7:23 ` [PATCH v3 4/4] ARM: dts: AM33XX: Add lis331dlh device tree data to am335x-evm AnilKumar Ch
2012-09-17 22:35 ` Andrew Morton
[not found] ` <20120917153559.e07ca263.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2012-09-18 7:35 ` AnilKumar, Chimata
2012-09-17 11:51 ` [PATCH v3 0/4] lis3: lis3lv02d_i2c: Add device tree support Arnd Bergmann
2012-09-26 20:24 ` Greg KH
2012-09-26 20:34 ` Andrew Morton
2012-09-26 20:44 ` Greg KH
2012-09-26 20:54 ` Andrew Morton
2012-09-26 20:57 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347866602-2088-4-git-send-email-anilkumar@ti.com \
--to=anilkumar@ti.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dmitry.torokhov@gmail.com \
--cc=eric.piel@tremplin-utc.net \
--cc=grant.likely@secretlab.ca \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@cam.ac.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).