1 files changed, 43 insertions, 6 deletions

diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
index 2b1482ad3f16..c439c827eea8 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.h
+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
@@ -26,12 +26,12 @@
 /*
  * This driver tries to support the "digital" accelerometer chips from
  * STMicroelectronics such as LIS3LV02DL, LIS302DL, LIS3L02DQ, LIS331DL,
- * LIS35DE, or LIS202DL. They are very similar in terms of programming, with
- * almost the same registers. In addition to differing on physical properties,
- * they differ on the number of axes (2/3), precision (8/12 bits), and special
- * features (freefall detection, click...). Unfortunately, not all the
- * differences can be probed via a register.
- * They can be connected either via I²C or SPI.
+ * LIS331DLH, LIS35DE, or LIS202DL. They are very similar in terms of
+ * programming, with almost the same registers. In addition to differing
+ * on physical properties, they differ on the number of axes (2/3),
+ * precision (8/12 bits), and special features (freefall detection,
+ * click...). Unfortunately, not all the differences can be probed via
+ * a register. They can be connected either via I²C or SPI.
  */
 
 #include <linux/lis3lv02d.h>
@@ -96,12 +96,22 @@ enum lis3lv02d_reg {
 };
 
 enum lis3_who_am_i {
+        WAI_3DLH        = 0x32, /* 16 bits: LIS331DLH */
         WAI_3DC         = 0x33, /* 8 bits: LIS3DC, HP3DC */
         WAI_12B         = 0x3A, /* 12 bits: LIS3LV02D[LQ]... */
         WAI_8B          = 0x3B, /* 8 bits: LIS[23]02D[LQ]... */
         WAI_6B          = 0x52, /* 6 bits: LIS331DLF - not supported */
 };
 
+enum lis3_type {
+        LIS3LV02D,
+        LIS3DC,
+        HP3DC,
+        LIS2302D,
+        LIS331DLF,
+        LIS331DLH,
+};
+
 enum lis3lv02d_ctrl1_12b {
         CTRL1_Xen       = 0x01,
         CTRL1_Yen       = 0x02,
@@ -129,6 +139,27 @@ enum lis3lv02d_ctrl1_3dc {
         CTRL1_ODR3      = 0x80,
 };
 
+enum lis331dlh_ctrl1 {
+        CTRL1_DR0       = 0x08,
+        CTRL1_DR1       = 0x10,
+        CTRL1_PM0       = 0x20,
+        CTRL1_PM1       = 0x40,
+        CTRL1_PM2       = 0x80,
+};
+
+enum lis331dlh_ctrl2 {
+        CTRL2_HPEN1     = 0x04,
+        CTRL2_HPEN2     = 0x08,
+        CTRL2_FDS_3DLH  = 0x10,
+        CTRL2_BOOT_3DLH = 0x80,
+};
+
+enum lis331dlh_ctrl4 {
+        CTRL4_STSIGN    = 0x08,
+        CTRL4_BLE       = 0x40,
+        CTRL4_BDU       = 0x80,
+};
+
 enum lis3lv02d_ctrl2 {
         CTRL2_DAS       = 0x01,
         CTRL2_SIM       = 0x02,
@@ -279,9 +310,14 @@ struct lis3lv02d {
         int                     data_ready_count[2];
         atomic_t                wake_thread;
         unsigned char           irq_cfg;
+        unsigned int            shift_adj;
 
         struct lis3lv02d_platform_data *pdata;  /* for passing board config */
         struct mutex            mutex;     /* Serialize poll and selftest */
+
+#ifdef CONFIG_OF
+        struct device_node      *of_node;
+#endif
 };
 
 int lis3lv02d_init_device(struct lis3lv02d *lis3);
@@ -290,5 +326,6 @@ void lis3lv02d_joystick_disable(struct lis3lv02d *lis3);
 void lis3lv02d_poweroff(struct lis3lv02d *lis3);
 int lis3lv02d_poweron(struct lis3lv02d *lis3);
 int lis3lv02d_remove_fs(struct lis3lv02d *lis3);
+int lis3lv02d_init_dt(struct lis3lv02d *lis3);
 
 extern struct lis3lv02d lis3_dev;