diff options
| author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-21 22:53:57 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-21 22:53:57 +0200 |
| commit | 8305c2adc8cfd5fbe18819401ec7cb117eaee9f6 (patch) | |
| tree | 7e541b5db61a34160d2d9675b96e81fa99af4e78 /drivers/sensor | |
| parent | cfeca268936a008ae5a22abdea42f90262f89646 (diff) | |
| download | kernel_samsung_smdk4412-8305c2adc8cfd5fbe18819401ec7cb117eaee9f6.zip kernel_samsung_smdk4412-8305c2adc8cfd5fbe18819401ec7cb117eaee9f6.tar.gz kernel_samsung_smdk4412-8305c2adc8cfd5fbe18819401ec7cb117eaee9f6.tar.bz2 | |
samsung opensource update 2
Diffstat (limited to 'drivers/sensor')
| -rw-r--r-- | drivers/sensor/cm36651.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/sensor/cm36651.c b/drivers/sensor/cm36651.c index b9650d5..e607ca5 100644 --- a/drivers/sensor/cm36651.c +++ b/drivers/sensor/cm36651.c @@ -79,11 +79,7 @@ #define CM36651_CANCELATION #ifdef CM36651_CANCELATION #define CANCELATION_FILE_PATH "/efs/prox_cal" -#ifndef CONFIG_MACH_M0 -#define CANCELATION_THRESHOLD 7 -#else -#define CANCELATION_THRESHOLD 6 -#endif +#define CANCELATION_THRESHOLD 9 #endif #define PROX_READ_NUM 40 @@ -375,14 +371,10 @@ static int proximity_store_cancelation(struct device *dev, bool do_calib) int err = 0; if (do_calib) { -#ifndef CONFIG_MACH_M0 mutex_lock(&cm36651->read_lock); cm36651_i2c_read_byte(cm36651, CM36651_PS, &ps_reg_setting[2][1]); mutex_unlock(&cm36651->read_lock); -#else - ps_reg_setting[2][1] = 7; -#endif ps_reg_setting[1][1] = CANCELATION_THRESHOLD; } else { /* reset */ ps_reg_setting[2][1] = 0; |