lis3: add click function

The LIS302DL accelerometer chip has a 'click' feature which can be used to
detect sudden motion on any of the three axis.  Configuration data is
passed via spi platform_data and no action is taken if that's not
specified, so it won't harm any existing platform.

To make the configuration effective, the IRQ lines need to be set up
appropriately.  This patch also adds a way to do that from board support
code.

The DD_* definitions were factored out to an own enum because they are
specific to LIS3LV02D devices.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
index 366190609c73c10c04830db52706a623c2191bc6..271338bdb6be55e5319349ef90fc127388ded3d9 100644 (file)
--- a/drivers/hwmon/lis3lv02d.c
+++ b/drivers/hwmon/lis3lv02d.c
@@ -438,6 +438,26 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
        if (lis3lv02d_joystick_enable())
                printk(KERN_ERR DRIVER_NAME ": joystick initialization failed\n");
 
+       /* passing in platform specific data is purely optional and only
+        * used by the SPI transport layer at the moment */
+       if (dev->pdata) {
+               struct lis3lv02d_platform_data *p = dev->pdata;
+
+               if (p->click_flags && (dev->whoami == LIS_SINGLE_ID)) {
+                       dev->write(dev, CLICK_CFG, p->click_flags);
+                       dev->write(dev, CLICK_TIMELIMIT, p->click_time_limit);
+                       dev->write(dev, CLICK_LATENCY, p->click_latency);
+                       dev->write(dev, CLICK_WINDOW, p->click_window);
+                       dev->write(dev, CLICK_THSZ, p->click_thresh_z & 0xf);
+                       dev->write(dev, CLICK_THSY_X,
+                                       (p->click_thresh_x & 0xf) |
+                                       (p->click_thresh_y << 4));
+               }
+
+               if (p->irq_cfg)
+                       dev->write(dev, CTRL_REG3, p->irq_cfg);
+       }
+
        /* bail if we did not get an IRQ from the bus layer */
        if (!dev->irq) {
                printk(KERN_ERR DRIVER_NAME

diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
index 5a5a196e6a66870eca4fbc6d06d95ae01f99a1d9..e320e2f511f160ee7a81dac45fec755575f9ee22 100644 (file)
--- a/drivers/hwmon/lis3lv02d.h
+++ b/drivers/hwmon/lis3lv02d.h
@@ -29,12 +29,14 @@
  * They can also be connected via I²C.
  */
 
+#include <linux/lis3lv02d.h>
+
 /* 2-byte registers */
 #define LIS_DOUBLE_ID  0x3A /* LIS3LV02D[LQ] */
 /* 1-byte registers */
 #define LIS_SINGLE_ID  0x3B /* LIS[32]02DL and others */
 
-enum lis3lv02d_reg {
+enum lis3_reg {
        WHO_AM_I        = 0x0F,
        OFFSET_X        = 0x16,
        OFFSET_Y        = 0x17,
@@ -62,6 +64,19 @@ enum lis3lv02d_reg {
        FF_WU_THS_L     = 0x34,
        FF_WU_THS_H     = 0x35,
        FF_WU_DURATION  = 0x36,
+};
+
+enum lis302d_reg {
+       CLICK_CFG       = 0x38,
+       CLICK_SRC       = 0x39,
+       CLICK_THSY_X    = 0x3B,
+       CLICK_THSZ      = 0x3C,
+       CLICK_TIMELIMIT = 0x3D,
+       CLICK_LATENCY   = 0x3E,
+       CLICK_WINDOW    = 0x3F,
+};
+
+enum lis3lv02d_reg {
        DD_CFG          = 0x38,
        DD_SRC          = 0x39,
        DD_ACK          = 0x3A,
@@ -183,6 +198,8 @@ struct lis3lv02d {
        struct fasync_struct    *async_queue; /* queue for the misc device */
        wait_queue_head_t       misc_wait; /* Wait queue for the misc device */
        unsigned long           misc_opened; /* bit0: whether the device is open */
+
+       struct lis3lv02d_platform_data *pdata;  /* for passing board config */
 };
 
 int lis3lv02d_init_device(struct lis3lv02d *lis3);

diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c
index 07ae74b0e191103564e881801ec4bc27225d8470..3827ff04485f9a726c3d5c8f8e6ab1742c309b4e 100644 (file)
--- a/drivers/hwmon/lis3lv02d_spi.c
+++ b/drivers/hwmon/lis3lv02d_spi.c
@@ -72,6 +72,7 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
        lis3_dev.write = lis3_spi_write;
        lis3_dev.irq = spi->irq;
        lis3_dev.ac = lis3lv02d_axis_normal;
+       lis3_dev.pdata = spi->dev.platform_data;
        spi_set_drvdata(spi, &lis3_dev);
 
        ret = lis3lv02d_init_device(&lis3_dev);

diff --git a/include/linux/lis3lv02d.h b/include/linux/lis3lv02d.h
new file mode 100644 (file)
index 0000000..ad651f4
--- /dev/null
+++ b/include/linux/lis3lv02d.h
@@ -0,0 +1,39 @@
+#ifndef __LIS3LV02D_H_
+#define __LIS3LV02D_H_
+
+struct lis3lv02d_platform_data {
+       /* please note: the 'click' feature is only supported for
+        * LIS[32]02DL variants of the chip and will be ignored for
+        * others */
+#define LIS3_CLICK_SINGLE_X    (1 << 0)
+#define LIS3_CLICK_DOUBLE_X    (1 << 1)
+#define LIS3_CLICK_SINGLE_Y    (1 << 2)
+#define LIS3_CLICK_DOUBLE_Y    (1 << 3)
+#define LIS3_CLICK_SINGLE_Z    (1 << 4)
+#define LIS3_CLICK_DOUBLE_Z    (1 << 5)
+       unsigned char click_flags;
+       unsigned char click_thresh_x;
+       unsigned char click_thresh_y;
+       unsigned char click_thresh_z;
+       unsigned char click_time_limit;
+       unsigned char click_latency;
+       unsigned char click_window;
+
+#define LIS3_IRQ1_DISABLE      (0 << 0)
+#define LIS3_IRQ1_FF_WU_1      (1 << 0)
+#define LIS3_IRQ1_FF_WU_2      (2 << 0)
+#define LIS3_IRQ1_FF_WU_12     (3 << 0)
+#define LIS3_IRQ1_DATA_READY   (4 << 0)
+#define LIS3_IRQ1_CLICK                (7 << 0)
+#define LIS3_IRQ2_DISABLE      (0 << 3)
+#define LIS3_IRQ2_FF_WU_1      (1 << 3)
+#define LIS3_IRQ2_FF_WU_2      (2 << 3)
+#define LIS3_IRQ2_FF_WU_12     (3 << 3)
+#define LIS3_IRQ2_DATA_READY   (4 << 3)
+#define LIS3_IRQ2_CLICK                (7 << 3)
+#define LIS3_IRQ_OPEN_DRAIN    (1 << 6)
+#define LIS3_IRQ_ACTIVE_HIGH   (1 << 7)
+       unsigned char irq_cfg;
+};
+
+#endif /* __LIS3LV02D_H_ */