github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop

Browse Source
This commit is contained in:
cwz 2011-08-03 01:10:48 -07:00
commit 6cfd80746f
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/input/misc/isl29028.c
View File

@ -71,6 +71,11 @@
#define ISL_REG_ALSIR_LDATA (0x09)
#define ISL_REG_ALSIR_HDATA (0x0a)
#define ISL_REG_ALSIR_TH1 (0x05)
#define ISL_REG_ALSIR_TH2 (0x06)
#define ISL_REG_ALSIR_TH3 (0x07)
struct isl29028_data {
struct input_dev *psensor_input_dev;
struct input_dev *lsensor_input_dev;
@ -707,6 +712,24 @@ static int isl29028_config(struct i2c_client *client)
printk("%s: config isl29028 PROX_HT(0x04) reg %#x \n", __FUNCTION__, value);
#endif
buf[0] = ISL_REG_ALSIR_TH1;
buf[1] = 0x0;
if ((ret = i2c_master_send(client, buf, 2)) < 2) {
printk("%s: config isl29028 register %#x err %d\n", __FUNCTION__, buf[0], ret);
}
buf[0] = ISL_REG_ALSIR_TH2;
buf[1] = 0xF0;
if ((ret = i2c_master_send(client, buf, 2)) < 2) {
printk("%s: config isl29028 register %#x err %d\n", __FUNCTION__, buf[0], ret);
}
buf[0] = ISL_REG_ALSIR_TH3;
buf[1] = 0xFF;
if ((ret = i2c_master_send(client, buf, 2)) < 2) {
printk("%s: config isl29028 register %#x err %d\n", __FUNCTION__, buf[0], ret);
}
mutex_unlock(&isl->lock);
return 0;