hwmon: (asus_atk0110) Enable the EC

[safe/jmp/linux-2.6] / drivers / hwmon / lis3lv02d.h

diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
index 5a5a196..3e1ff46 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,
@@ -56,6 +58,27 @@ enum lis3lv02d_reg {
        OUTZ_L          = 0x2C,
        OUTZ_H          = 0x2D,
        OUTZ            = 0x2D,
+};
+
+enum lis302d_reg {
+       FF_WU_CFG_1     = 0x30,
+       FF_WU_SRC_1     = 0x31,
+       FF_WU_THS_1     = 0x32,
+       FF_WU_DURATION_1 = 0x33,
+       FF_WU_CFG_2     = 0x34,
+       FF_WU_SRC_2     = 0x35,
+       FF_WU_THS_2     = 0x36,
+       FF_WU_DURATION_2 = 0x37,
+       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 {
        FF_WU_CFG       = 0x30,
        FF_WU_SRC       = 0x31,
        FF_WU_ACK       = 0x32,
@@ -92,6 +115,10 @@ enum lis3lv02d_ctrl2 {
        CTRL2_FS        = 0x80, /* Full Scale selection */
 };
 
+enum lis302d_ctrl2 {
+       HP_FF_WU2       = 0x08,
+       HP_FF_WU1       = 0x04,
+};
 
 enum lis3lv02d_ctrl3 {
        CTRL3_CFS0      = 0x01,
@@ -183,6 +210,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);