A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

vl53l1 driver-version update to 13.1.1.2129

Browse source 
change list:
update vl53l3 tuning setting

Change-Id: I71c6d85efec5bb6b565fa320bdaabab9c3f2b994
Signed-off-by: liuyc20 <liuyc20@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1427656
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Lei Chen <chenl18@motorola.com>
Reviewed-by: Yonghua Yan <yanyh2@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
liuyc20 2019-09-25 16:16:41 +08:00 • committed by Yuecai Liu
commit 9a990d58ea
4 changed files with 20 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/input/misc/vl53L1/inc/vl53l1_def.h
View file

@ -87,9 +87,9 @@ extern "C" {
/** VL53L1 IMPLEMENTATION minor version */
#define VL53L1_IMPLEMENTATION_VER_MINOR 1
/** VL53L1 IMPLEMENTATION sub version */
#define VL53L1_IMPLEMENTATION_VER_SUB 0
#define VL53L1_IMPLEMENTATION_VER_SUB 1
/** VL53L1 IMPLEMENTATION sub version */
#define VL53L1_IMPLEMENTATION_VER_REVISION 2120
#define VL53L1_IMPLEMENTATION_VER_REVISION 2129
/****************************************
* PRIVATE define do not edit

12
drivers/input/misc/vl53L1/src/vl53l1_api.c
View file

@ -3177,13 +3177,11 @@ VL53L1_Error VL53L1_PerformOffsetSimpleCalibration(VL53L1_DEV Dev,
Status = VL53L1_StartMeasurement(Dev);
if (Status == VL53L1_ERROR_NONE)
Status = VL53L1_WaitMeasurementDataReady(Dev);
if (Status == VL53L1_ERROR_NONE)
Status = VL53L1_GetRangingMeasurementData(Dev,
&RangingMeasurementData);
if (Status == VL53L1_ERROR_NONE)
Status = VL53L1_ClearInterruptAndStartMeasurement(Dev);
if (Status == VL53L1_ERROR_NONE) {
VL53L1_WaitMeasurementDataReady(Dev);
VL53L1_GetRangingMeasurementData(Dev, &RangingMeasurementData);
VL53L1_ClearInterruptAndStartMeasurement(Dev);
}
inloopcount = 0;

2
drivers/input/misc/vl53L1/stmvl53l1.h
View file

@ -71,7 +71,7 @@
*/
/* define CFG_STMVL53L1_HAVE_REGULATOR */
#define DRIVER_VERSION "13.1.0"
#define DRIVER_VERSION "13.1.1"
/** @ingroup vl53l1_config
* @{

68
drivers/input/misc/vl53L1/stmvl53l1_module.c
View file

@ -141,26 +141,6 @@
struct timeval start_tv, stop_tv;
#endif
/* Set special tuning parameters for VL53L3 (ticket 513812) */
static const int tunings_L3[][2] = {
{VL53L1_TUNINGPARM_HIST_AMB_THRESH_SIGMA_1, 80},
{VL53L1_TUNINGPARM_HIST_SIGNAL_TOTAL_EVENTS_LIMIT, 50},
{VL53L1_TUNINGPARM_HIST_SIGMA_THRESH_MM, 180},
{VL53L1_TUNINGPARM_CONSISTENCY_HIST_MIN_MAX_TOLERANCE_MM, 0},
{VL53L1_TUNINGPARM_XTALK_DETECT_MAX_VALID_RATE_KCPS, 400},
{VL53L1_TUNINGPARM_HIST_XTALK_MARGIN_KCPS, 0},
{VL53L1_TUNINGPARM_XTALK_EXTRACT_NUM_OF_SAMPLES, 13},
{VL53L1_TUNINGPARM_XTALK_EXTRACT_MAX_VALID_RATE_KCPS, 640},
{VL53L1_TUNINGPARM_DYNXTALK_SMUDGE_MARGIN, 0},
{VL53L1_TUNINGPARM_DYNXTALK_NOISE_MARGIN, 100},
{VL53L1_TUNINGPARM_DYNXTALK_SINGLE_XTALK_DELTA, 2048},
{VL53L1_TUNINGPARM_DYNXTALK_AVERAGED_XTALK_DELTA, 308},
{VL53L1_TUNINGPARM_DYNXTALK_CLIP_LIMIT, 10240},
{VL53L1_TUNINGPARM_DYNXTALK_XTALK_AMB_THRESHOLD, 128},
{VL53L1_TUNINGPARM_DYNXTALK_NODETECT_SAMPLE_LIMIT, 40}
};
/* End of Set special tuning parameters for VL53L3 (ticket 513812) */
/* Set default value to 1 to allow to see module insertion debug messages */
int stmvl53l1_enable_debug = 1;
@ -523,7 +503,7 @@ static void dump_roi(VL53L1_UserRoi_t *rois, uint32_t n)
# define dump_roi(...) (void)0
#endif
static int setup_tunings(struct stmvl53l1_data *data, uint8_t ProductType)
static int setup_tunings(struct stmvl53l1_data *data)
{
int rc = 0;
int i;
@ -537,40 +517,6 @@ static int setup_tunings(struct stmvl53l1_data *data, uint8_t ProductType)
}
}
/* Set special tuning parameters for VL53L3 (ticket 513812) */
if ((!rc) && (ProductType == 0xAA))
{
for (i = 0; i < ARRAY_SIZE(tunings_L3); i++) {
rc = VL53L1_SetTuningParameter(&data->stdev, tunings_L3[i][0],
tunings_L3[i][1]);
if (rc) {
rc = store_last_error(data, rc);
break;
}
}
if (!rc) {
/* Special setting forbidden by VL53L1_SetTuningParameter
* (ticket 487847)
* Use VL53L1_set_tuning_parm to force a specific value */
rc = VL53L1_set_tuning_parm(&data->stdev,
VL53L1_TUNINGPARM_DYNXTALK_NODETECT_XTALK_OFFSET_KCPS,
410);
if (rc)
rc = store_last_error(data, rc);
}
if (!rc) {
/*Some default settings here for VL53L3*/
data->timing_budget = 30000;
data->crosstalk_enable = 1;
data->dmax_mode = VL53L1_DMAXMODE_CUSTCAL_DATA;
data->smudge_correction_mode = VL53L1_SMUDGE_CORRECTION_CONTINUOUS;
data->dmax_reflectance = (5 << 16);
}
}
/* End of Set special tuning parameters for VL53L3 (ticket 513812) */
return rc;
}
@ -4601,12 +4547,22 @@ int stmvl53l1_setup(struct stmvl53l1_data *data)
}
/* set tuning from stmvl53l1_tunings.h */
rc = setup_tunings(data, dev_info.ProductType);
rc = setup_tunings(data);
if (rc) {
vl53l1_errmsg("setup_tunings %d\n", rc);
goto exit_unregister_dev_ps;
}
/* Set special parameters for VL53L3 (ticket 513812) */
if (dev_info.ProductType == 0xAA)
{
data->timing_budget = 30000;
data->crosstalk_enable = 1;
data->dmax_mode = VL53L1_DMAXMODE_CUSTCAL_DATA;
data->smudge_correction_mode = VL53L1_SMUDGE_CORRECTION_CONTINUOUS;
data->dmax_reflectance = (5 << 16);
}
data->hw_rev = dev_info.ProductRevisionMinor;
memset(&cali_data, 0, sizeof(cali_data));