Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc2db05 authored by AnilKumar Ch's avatar AnilKumar Ch Committed by Greg Kroah-Hartman
Browse files

drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init 



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.

[akpm@linux-foundation.org: fix CONFIG_OF=n build]
Signed-off-by: default avatarAnilKumar Ch <anilkumar@ti.com>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79df8d27

Documentation/devicetree/bindings/misc/lis302.txt

+36 −0
Original line number Diff line number Diff line
@@ -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>;

	};

drivers/misc/lis3lv02d/lis3lv02d_i2c.c

+23 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ 
#include <linux/i2c.h>

#include <linux/pm_runtime.h>

#include <linux/delay.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/of_device.h>



#include "lis3lv02d.h"



#define DRV_NAME	"lis3lv02d_i2c"
@@ -102,12 +106,30 @@ 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 } };



#ifdef CONFIG_OF

static struct of_device_id lis3lv02d_i2c_dt_ids[] = {

	{ .compatible = "st,lis3lv02d" },

	{}

};

MODULE_DEVICE_TABLE(of, lis3lv02d_i2c_dt_ids);

#endif



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;



#ifdef CONFIG_OF

	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;

	}

#endif



	if (pdata) {

		if ((pdata->driver_features & LIS3_USE_BLOCK_READ) &&

			(i2c_check_functionality(client->adapter,
@@ -255,6 +277,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),