android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "thermal: adc-tm: Correct a macro expression for PMIC7 ADC_TM"

Browse Source
This commit is contained in:
qctecmdr 2020-02-25 09:08:41 -08:00 committed by Gerrit - the friendly Code Review server
commit e2298d13da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/thermal/qcom/adc-tm7.c
View File

@ -61,7 +61,7 @@
#define ADC_TM_HIGH_THR0 0x4b
#define ADC_TM_HIGH_THR1 0x4c
#define ADC_TM_LOWER_MASK(n) ((n) & GENMASK(7, 0))
#define ADC_TM_UPPER_MASK(n) ((n) & GENMASK(15, 8) >> 8)
#define ADC_TM_UPPER_MASK(n) (((n) & GENMASK(15, 8)) >> 8)
#define ADC_TM_MEAS_IRQ_EN 0x4d
#define ADC_TM_MEAS_EN BIT(7)
@ -166,7 +166,7 @@ static int adc_tm7_configure(struct adc_tm_sensor *sensor)
buf[11] = ADC_TM_LOWER_MASK(mask);
buf[12] = ADC_TM_UPPER_MASK(mask);
buf[13] |= (sensor->meas_en | sensor->high_thr_en << 1 |
buf[13] = (sensor->meas_en | sensor->high_thr_en << 1 |
sensor->low_thr_en);
ret = adc_tm_write_reg(chip, ADC_TM_SID, buf, 14);