sensors:add light sensor isl29023 support

diff --git a/drivers/input/sensors/lsensor/Kconfig b/drivers/input/sensors/lsensor/Kconfig
index 5cd38076dc3d4f8bcad1b81213c35f8a33565118..18bde7618f5d86bd80c0c3dbbacf0a170e6f8e3c 100755 (executable)
--- a/drivers/input/sensors/lsensor/Kconfig
+++ b/drivers/input/sensors/lsensor/Kconfig
@@ -17,6 +17,10 @@ config LS_AL3006
 
 config LS_STK3171
   bool "light sensor stk3171"
+       default n        
+
+config LS_ISL29023
+  bool "light sensor isl29023"
        default n         
 endif
 

diff --git a/drivers/input/sensors/lsensor/Makefile b/drivers/input/sensors/lsensor/Makefile
index 98836f434c06583d3a3b066c74e164510cfb43c1..5127b4396f42a52c4e2e0c6b87bae93e86748be5 100755 (executable)
--- a/drivers/input/sensors/lsensor/Makefile
+++ b/drivers/input/sensors/lsensor/Makefile
@@ -2,4 +2,5 @@
 
 obj-$(CONFIG_LS_CM3217)                += cm3217.o
 obj-$(CONFIG_LS_AL3006)                += ls_al3006.o
-obj-$(CONFIG_LS_STK3171)               += ls_stk3171.o
\ No newline at end of file
+obj-$(CONFIG_LS_STK3171)               += ls_stk3171.o
+obj-$(CONFIG_LS_ISL29023)              += isl29023.o
\ No newline at end of file

diff --git a/drivers/input/sensors/lsensor/isl29023.c b/drivers/input/sensors/lsensor/isl29023.c
new file mode 100755 (executable)
index 0000000..d71c7ce
--- /dev/null
+++ b/drivers/input/sensors/lsensor/isl29023.c
@@ -0,0 +1,276 @@
+/* drivers/input/sensors/access/kxtik.c\r
+ *\r
+ * Copyright (C) 2012-2015 ROCKCHIP.\r
+ * Author: luowei <lw@rock-chips.com>\r
+ *\r
+ * This software is licensed under the terms of the GNU General Public\r
+ * License version 2, as published by the Free Software Foundation, and\r
+ * may be copied, distributed, and modified under those terms.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ */\r
+#include <linux/interrupt.h>\r
+#include <linux/i2c.h>\r
+#include <linux/slab.h>\r
+#include <linux/irq.h>\r
+#include <linux/miscdevice.h>\r
+#include <linux/gpio.h>\r
+#include <asm/uaccess.h>\r
+#include <asm/atomic.h>\r
+#include <linux/delay.h>\r
+#include <linux/input.h>\r
+#include <linux/workqueue.h>\r
+#include <linux/freezer.h>\r
+#include <mach/gpio.h>\r
+#include <mach/board.h> \r
+#ifdef CONFIG_HAS_EARLYSUSPEND\r
+#include <linux/earlysuspend.h>\r
+#endif\r
+#include <linux/sensor-dev.h>\r
+\r
+#if 0\r
+#define SENSOR_DEBUG_TYPE SENSOR_TYPE_LIGHT\r
+#define DBG(x...) if(sensor->pdata->type == SENSOR_DEBUG_TYPE) printk(x)\r
+#else\r
+#define DBG(x...)\r
+#endif\r
+\r
+#define ISL29023_REG_ADD_COMMAND1      0x00\r
+#define COMMMAND1_OPMODE_SHIFT         5\r
+#define COMMMAND1_OPMODE_MASK          (7 << COMMMAND1_OPMODE_SHIFT)\r
+#define COMMMAND1_OPMODE_POWER_DOWN    (0 << COMMMAND1_OPMODE_SHIFT)\r
+#define COMMMAND1_OPMODE_ALS_ONCE      (1 << COMMMAND1_OPMODE_SHIFT)\r
+#define COMMMAND1_OPMODE_IR_ONCE       (2 << COMMMAND1_OPMODE_SHIFT)\r
+#define COMMMAND1_OPMODE_ALS_CONTINUE  (5 << COMMMAND1_OPMODE_SHIFT)\r
+#define COMMMAND1_OPMODE_IR_CONTINUE   (6 << COMMMAND1_OPMODE_SHIFT)\r
+\r
+\r
+#define ISL29023_REG_ADD_COMMANDII     0x01\r
+#define COMMANDII_RESOLUTION_SHIFT     2\r
+#define COMMANDII_RESOLUTION_65536     (0x0 << COMMANDII_RESOLUTION_SHIFT)\r
+#define COMMANDII_RESOLUTION_4096      (0x1 << COMMANDII_RESOLUTION_SHIFT)\r
+#define COMMANDII_RESOLUTION_256       (0x2 << COMMANDII_RESOLUTION_SHIFT)\r
+#define COMMANDII_RESOLUTION_16                (0x3 << COMMANDII_RESOLUTION_SHIFT)\r
+#define COMMANDII_RESOLUTION_MASK      (0x3 << COMMANDII_RESOLUTION_SHIFT)\r
+\r
+#define COMMANDII_RANGE_SHIFT          0\r
+#define COMMANDII_RANGE_1000           (0x0 << COMMANDII_RANGE_SHIFT)\r
+#define COMMANDII_RANGE_4000           (0x1 << COMMANDII_RANGE_SHIFT)\r
+#define COMMANDII_RANGE_16000          (0x2 << COMMANDII_RANGE_SHIFT)\r
+#define COMMANDII_RANGE_64000          (0x3 << COMMANDII_RANGE_SHIFT)\r
+#define COMMANDII_RANGE_MASK           (0x3 << COMMANDII_RANGE_SHIFT)\r
+\r
+\r
+#define COMMANDII_RANGE_MASK           (0x3 << COMMANDII_RANGE_SHIFT)\r
+\r
+#define COMMANDII_SCHEME_SHIFT         7\r
+#define COMMANDII_SCHEME_MASK          (0x1 << COMMANDII_SCHEME_SHIFT)\r
+\r
+#define ISL29023_REG_ADD_DATA_LSB      0x02\r
+#define ISL29023_REG_ADD_DATA_MSB      0x03\r
+#define ISL29023_MAX_REGS              ISL29023_REG_ADD_DATA_MSB\r
+\r
+#define ISL29023_REG_LT_LSB            0x04\r
+#define ISL29023_REG_LT_MSB            0x05\r
+#define ISL29023_REG_HT_LSB            0x06\r
+#define ISL29023_REG_HT_MSB            0x07\r
+\r
+\r
+/****************operate according to sensor chip:start************/\r
+\r
+static int sensor_active(struct i2c_client *client, int enable, int rate)\r
+{\r
+       struct sensor_private_data *sensor =\r
+           (struct sensor_private_data *) i2c_get_clientdata(client);  \r
+       int result = 0;\r
+       int status = 0;\r
+\r
+       sensor->ops->ctrl_data = sensor_read_reg(client, sensor->ops->ctrl_reg);\r
+       \r
+       //register setting according to chip datasheet          \r
+       if(enable)\r
+       {       \r
+               sensor->ops->ctrl_data &= 0x1f;         \r
+               sensor->ops->ctrl_data |= COMMMAND1_OPMODE_ALS_CONTINUE;        \r
+       }\r
+       else\r
+       {\r
+               sensor->ops->ctrl_data &= 0x1f; \r
+               //sensor->ops->ctrl_data |= COMMMAND1_OPMODE_POWER_DOWN;        \r
+       }\r
+               \r
+       DBG("%s:reg=0x%x,reg_ctrl=0x%x,enable=%d\n",__func__,sensor->ops->ctrl_reg, sensor->ops->ctrl_data, enable);\r
+       result = sensor_write_reg(client, sensor->ops->ctrl_reg, sensor->ops->ctrl_data);\r
+       if(result)\r
+               printk("%s:fail to active sensor\n",__func__);\r
+\r
+       if(enable)\r
+       sensor->ops->report(sensor->client);\r
+       \r
+       return result;\r
+\r
+}\r
+\r
+\r
+static int sensor_init(struct i2c_client *client)\r
+{      \r
+       struct sensor_private_data *sensor =\r
+           (struct sensor_private_data *) i2c_get_clientdata(client);  \r
+       int result = 0;\r
+       \r
+       result = sensor->ops->active(client,0,0);\r
+       if(result)\r
+       {\r
+               printk("%s:line=%d,error\n",__func__,__LINE__);\r
+               return result;\r
+       }\r
+       \r
+       sensor->status_cur = SENSOR_OFF;\r
+\r
+       result = sensor_write_reg(client, ISL29023_REG_ADD_COMMANDII, COMMANDII_RANGE_4000 | COMMANDII_RESOLUTION_4096);\r
+       if(result)\r
+       {\r
+               printk("%s:line=%d,error\n",__func__,__LINE__);\r
+               return result;\r
+       }\r
+               \r
+       return result;\r
+}\r
+\r
+\r
+static int light_report_value(struct input_dev *input, int data)\r
+{\r
+       unsigned char index = 0;\r
+\r
+       if(data <= 2){\r
+               index = 0;goto report;\r
+       }\r
+       else if(data <= 3){\r
+               index = 2;goto report;\r
+       }\r
+       else if(data <= 5){\r
+               index = 3;goto report;\r
+       }\r
+       else if(data <= 8){\r
+               index = 4;goto report;\r
+       }\r
+       else if(data <= 11){\r
+               index = 5;goto report;\r
+       }\r
+       else if(data <= 14){\r
+               index = 6;goto report;\r
+       }\r
+       else if(data <= 17){\r
+               index = 7;goto report;\r
+       }\r
+       else{\r
+               index = 7;goto report;\r
+       }\r
+\r
+report:\r
+       input_report_abs(input, ABS_MISC, index);\r
+       input_sync(input);\r
+       \r
+       return index;\r
+}\r
+\r
+\r
+static int sensor_report_value(struct i2c_client *client)\r
+{\r
+       struct sensor_private_data *sensor =\r
+           (struct sensor_private_data *) i2c_get_clientdata(client);  \r
+       int result = 0;\r
+       int value = 0;\r
+       char buffer[2] = {0};   \r
+       char index = 0;\r
+       \r
+       if(sensor->ops->read_len < 2)   //sensor->ops->read_len = 2\r
+       {\r
+               printk("%s:lenth is error,len=%d\n",__func__,sensor->ops->read_len);\r
+               return -1;\r
+       }\r
+       \r
+       memset(buffer, 0, 2);\r
+\r
+       buffer[0] = sensor->ops->read_reg;\r
+       result = sensor_rx_data(client, buffer, sensor->ops->read_len); \r
+       if(result)\r
+       {\r
+               printk("%s:line=%d,error\n",__func__,__LINE__);\r
+               return result;\r
+       }\r
+\r
+       value = (buffer[1] << 8) | buffer[0];\r
+\r
+       \r
+       index = light_report_value(sensor->input_dev, value);\r
+\r
+       DBG("%s:%s result=0x%x,index=%d\n",__func__,sensor->ops->name, value,index);\r
+       \r
+       if(sensor->pdata->irq_enable)\r
+       {\r
+               if(sensor->ops->int_status_reg)\r
+               {       \r
+                       value = sensor_read_reg(client, sensor->ops->int_status_reg);\r
+               }\r
+               \r
+       }\r
+       \r
+                       \r
+       return result;\r
+}\r
+\r
+struct sensor_operate light_stk3171_ops = {\r
+       .name                           = "ls_isl29023",\r
+       .type                           = SENSOR_TYPE_LIGHT,    //sensor type and it should be correct\r
+       .id_i2c                         = LIGHT_ID_ISL29023,    //i2c id number\r
+       .read_reg                       = ISL29023_REG_ADD_DATA_LSB,            //read data\r
+       .read_len                       = 2,                    //data length\r
+       .id_reg                         = SENSOR_UNKNOW_DATA,   //read device id from this register\r
+       .id_data                        = SENSOR_UNKNOW_DATA,   //device id\r
+       .precision                      = 16,                   //8 bits\r
+       .ctrl_reg                       = ISL29023_REG_ADD_COMMAND1,            //enable or disable \r
+       .int_status_reg                 = ISL29023_REG_ADD_COMMAND1,            //intterupt status register\r
+       .range                          = {100,65535},          //range\r
+       .brightness                     ={10,255},     //brightness\r
+       .trig                           = IRQF_TRIGGER_LOW | IRQF_ONESHOT,              \r
+       .active                         = sensor_active,        \r
+       .init                           = sensor_init,\r
+       .report                         = sensor_report_value,\r
+};\r
+\r
+/****************operate according to sensor chip:end************/\r
+\r
+//function name should not be changed\r
+static struct sensor_operate *light_get_ops(void)\r
+{\r
+       return &light_stk3171_ops;\r
+}\r
+\r
+\r
+static int __init light_stk3171_init(void)\r
+{\r
+       struct sensor_operate *ops = light_get_ops();\r
+       int result = 0;\r
+       int type = ops->type;\r
+       result = sensor_register_slave(type, NULL, NULL, light_get_ops);\r
+       //printk("%s\n",__func__);\r
+       return result;\r
+}\r
+\r
+static void __exit light_stk3171_exit(void)\r
+{\r
+       struct sensor_operate *ops = light_get_ops();\r
+       int type = ops->type;\r
+       sensor_unregister_slave(type, NULL, NULL, light_get_ops);\r
+}\r
+\r
+\r
+module_init(light_stk3171_init);\r
+module_exit(light_stk3171_exit);\r
+\r
+\r

diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c
index 4eb052a5065d07c5e2ee47fe609ec7501580bd2b..a3050cbac4d89e5ef2b968e0415d3df8095944ab 100755 (executable)
--- a/drivers/input/sensors/sensor-dev.c
+++ b/drivers/input/sensors/sensor-dev.c
@@ -302,6 +302,8 @@ static int sensor_irq_init(struct i2c_client *client)
                client->irq = irq;\r
                if((sensor->pdata->type == SENSOR_TYPE_GYROSCOPE) || (sensor->pdata->type == SENSOR_TYPE_ACCEL))\r
                disable_irq_nosync(client->irq);//disable irq\r
+               if(((sensor->pdata->type == SENSOR_TYPE_LIGHT) || ((sensor->pdata->type == SENSOR_TYPE_PROXIMITY))) && (!(sensor->ops->trig & IRQF_SHARED)))    \r
+               disable_irq_nosync(client->irq);//disable irq\r
                printk("%s:use irq=%d\n",__func__,irq);\r
        }\r
        else if(!sensor->pdata->irq_enable)\r
@@ -777,12 +779,17 @@ static long light_dev_ioctl(struct file *file,
                                        printk("%s:fail to active sensor,ret=%d\n",__func__,result);         \r
                                        goto error;           \r
                                        }       \r
-                                       \r
-                                       if(!sensor->pdata->irq_enable)\r
+                                       if(sensor->pdata->irq_enable && (!(sensor->ops->trig & IRQF_SHARED)))\r
+                                       {\r
+                                               DBG("%s:enable irq,irq=%d\n",__func__,client->irq);\r
+                                               enable_irq(client->irq);        //enable irq\r
+                                       }       \r
+                                       else\r
                                        {\r
                                                PREPARE_DELAYED_WORK(&sensor->delaywork, sensor_delaywork_func);\r
                                                schedule_delayed_work(&sensor->delaywork, msecs_to_jiffies(sensor->pdata->poll_delay_ms));\r
                                        }\r
+                                       \r
                                        sensor->status_cur = SENSOR_ON;\r
                                }       \r
                        }\r
@@ -795,8 +802,14 @@ static long light_dev_ioctl(struct file *file,
                                        goto error;\r
                                        }\r
                                        \r
-                                       if(!sensor->pdata->irq_enable)\r
-                                       cancel_delayed_work_sync(&sensor->delaywork);           \r
+                                       if(sensor->pdata->irq_enable && (!(sensor->ops->trig & IRQF_SHARED)))\r
+                                       {                               \r
+                                               DBG("%s:disable irq,irq=%d\n",__func__,client->irq);\r
+                                               disable_irq_nosync(client->irq);//disable irq\r
+                                       }\r
+                                       else\r
+                                       cancel_delayed_work_sync(&sensor->delaywork);   \r
+                                       \r
                                        sensor->status_cur = SENSOR_OFF;\r
                                }\r
                        }\r
@@ -861,11 +874,17 @@ static long proximity_dev_ioctl(struct file *file,
                                        goto error;           \r
                                        }\r
                                        \r
-                                       if(!sensor->pdata->irq_enable)\r
+                                       if(sensor->pdata->irq_enable && (!(sensor->ops->trig & IRQF_SHARED)))\r
+                                       {\r
+                                               DBG("%s:enable irq,irq=%d\n",__func__,client->irq);\r
+                                               enable_irq(client->irq);        //enable irq\r
+                                       }       \r
+                                       else\r
                                        {\r
                                                PREPARE_DELAYED_WORK(&sensor->delaywork, sensor_delaywork_func);\r
                                                schedule_delayed_work(&sensor->delaywork, msecs_to_jiffies(sensor->pdata->poll_delay_ms));\r
                                        }\r
+                                       \r
                                        sensor->status_cur = SENSOR_ON;\r
                                }       \r
                        }\r
@@ -877,7 +896,12 @@ static long proximity_dev_ioctl(struct file *file,
                                        mutex_unlock(&sensor->operation_mutex);              \r
                                        goto error;\r
                                        }\r
-                                       if(!sensor->pdata->irq_enable)\r
+                                       if(sensor->pdata->irq_enable && (!(sensor->ops->trig & IRQF_SHARED)))\r
+                                       {                               \r
+                                               DBG("%s:disable irq,irq=%d\n",__func__,client->irq);\r
+                                               disable_irq_nosync(client->irq);//disable irq\r
+                                       }\r
+                                       else\r
                                        cancel_delayed_work_sync(&sensor->delaywork);           \r
                                        sensor->status_cur = SENSOR_OFF;\r
                                }\r
@@ -1377,6 +1401,7 @@ static const struct i2c_device_id sensor_id[] = {
        {"light_cm3217", LIGHT_ID_CM3217},\r
        {"light_al3006", LIGHT_ID_AL3006},\r
        {"ls_stk3171", LIGHT_ID_STK3171},\r
+       {"ls_isl29023", LIGHT_ID_ISL29023},\r
        /*proximity sensor*/\r
        {"psensor", PROXIMITY_ID_ALL},\r
        {"proximity_al3006", PROXIMITY_ID_AL3006},      \r

diff --git a/include/linux/sensor-dev.h b/include/linux/sensor-dev.h
old mode 100644 (file)
new mode 100755 (executable)
index 60880b8..38f4490
--- a/include/linux/sensor-dev.h
+++ b/include/linux/sensor-dev.h
@@ -77,6 +77,7 @@ enum sensor_id {
        LIGHT_ID_CM3217,\r
        LIGHT_ID_AL3006,\r
        LIGHT_ID_STK3171,\r
+       LIGHT_ID_ISL29023,\r
        \r
        PROXIMITY_ID_ALL,\r
        PROXIMITY_ID_AL3006,\r