Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[safe/jmp/linux-2.6] / include / linux / lis3lv02d.h

diff --git a/include/linux/lis3lv02d.h b/include/linux/lis3lv02d.h
index 3cc2f2c..0e8a346 100644 (file)
--- a/include/linux/lis3lv02d.h
+++ b/include/linux/lis3lv02d.h
@@ -25,12 +25,14 @@ struct lis3lv02d_platform_data {
 #define LIS3_IRQ1_FF_WU_12     (3 << 0)
 #define LIS3_IRQ1_DATA_READY   (4 << 0)
 #define LIS3_IRQ1_CLICK                (7 << 0)
+#define LIS3_IRQ1_MASK         (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_IRQ2_MASK         (7 << 3)
 #define LIS3_IRQ_OPEN_DRAIN    (1 << 6)
 #define LIS3_IRQ_ACTIVE_LOW    (1 << 7)
        unsigned char irq_cfg;
@@ -43,6 +45,31 @@ struct lis3lv02d_platform_data {
 #define LIS3_WAKEUP_Z_HI       (1 << 5)
        unsigned char wakeup_flags;
        unsigned char wakeup_thresh;
+       unsigned char wakeup_flags2;
+       unsigned char wakeup_thresh2;
+#define LIS3_HIPASS_CUTFF_8HZ   0
+#define LIS3_HIPASS_CUTFF_4HZ   1
+#define LIS3_HIPASS_CUTFF_2HZ   2
+#define LIS3_HIPASS_CUTFF_1HZ   3
+#define LIS3_HIPASS1_DISABLE    (1 << 2)
+#define LIS3_HIPASS2_DISABLE    (1 << 3)
+       unsigned char hipass_ctrl;
+#define LIS3_NO_MAP            0
+#define LIS3_DEV_X             1
+#define LIS3_DEV_Y             2
+#define LIS3_DEV_Z             3
+#define LIS3_INV_DEV_X        -1
+#define LIS3_INV_DEV_Y        -2
+#define LIS3_INV_DEV_Z        -3
+       s8 axis_x;
+       s8 axis_y;
+       s8 axis_z;
+       int (*setup_resources)(void);
+       int (*release_resources)(void);
+       /* Limits for selftest are specified in chip data sheet */
+       s16 st_min_limits[3]; /* min pass limit x, y, z */
+       s16 st_max_limits[3]; /* max pass limit x, y, z */
+       int irq2;
 };
 
 #endif /* __LIS3LV02D_H_ */