Message ID | 20200716022817.30439-8-ansuelsmth@gmail.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Add support for ipq8064 tsens | expand |
Hi Ansuel, On Thu, Jul 16, 2020 at 7:58 AM Ansuel Smith <ansuelsmth@gmail.com> wrote: > > Add custom set_trip function for 8960 needed to set trip point to the > tsens driver for 8960 driver. Please describe why it needs a custom function please. > > Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> > --- > drivers/thermal/qcom/tsens-8960.c | 78 +++++++++++++++++++++++++++++++ > 1 file changed, 78 insertions(+) > > diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c > index 20d0bfb10f1f..4ad65ab3fd18 100644 > --- a/drivers/thermal/qcom/tsens-8960.c > +++ b/drivers/thermal/qcom/tsens-8960.c > @@ -93,6 +93,15 @@ > TSENS_8064_SENSOR9_EN | \ > TSENS_8064_SENSOR10_EN) > > +/* Trips: from very hot to very cold */ > +enum tsens_trip_type { > + TSENS_TRIP_STAGE3 = 0, > + TSENS_TRIP_STAGE2, > + TSENS_TRIP_STAGE1, > + TSENS_TRIP_STAGE0, > + TSENS_TRIP_NUM, > +}; > + > u32 tsens_8960_slope[] = { > 1176, 1176, 1154, 1176, > 1111, 1132, 1132, 1199, > @@ -110,6 +119,16 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s) > return adc_code * slope + offset; > } > > +static int mdegC_to_code(int degC, const struct tsens_sensor *s) > +{ > + int slope, offset; > + > + slope = thermal_zone_get_slope(s->tzd); > + offset = CAL_MDEGC - slope * s->offset; > + > + return degC / slope - offset; > +} > + > static void notify_uspace_tsens_fn(struct work_struct *work) > { > struct tsens_sensor *s = container_of(work, struct tsens_sensor, > @@ -448,6 +467,64 @@ static int get_temp_8960(const struct tsens_sensor *s, int *temp) > return -ETIMEDOUT; > } > > +static int set_trip_temp_ipq8064(void *data, int trip, int temp) > +{ > + unsigned int reg_th, reg_cntl; > + int ret, code, code_chk, hi_code, lo_code; > + const struct tsens_sensor *s = data; > + struct tsens_priv *priv = s->priv; > + > + code = mdegC_to_code(temp, s); > + code_chk = code; > + > + if (code < THRESHOLD_MIN_CODE || code > THRESHOLD_MAX_CODE) > + return -EINVAL; > + > + ret = regmap_read(priv->tm_map, STATUS_CNTL_ADDR_8064, ®_cntl); > + if (ret) > + return ret; > + > + ret = regmap_read(priv->tm_map, THRESHOLD_ADDR, ®_th); > + if (ret) > + return ret; > + > + hi_code = (reg_th & THRESHOLD_UPPER_LIMIT_MASK) > + >> THRESHOLD_UPPER_LIMIT_SHIFT; > + lo_code = (reg_th & THRESHOLD_LOWER_LIMIT_MASK) > + >> THRESHOLD_LOWER_LIMIT_SHIFT; > + > + switch (trip) { > + case TSENS_TRIP_STAGE3: > + code <<= THRESHOLD_MAX_LIMIT_SHIFT; > + reg_th &= ~THRESHOLD_MAX_LIMIT_MASK; > + break; > + case TSENS_TRIP_STAGE2: > + if (code_chk <= lo_code) > + return -EINVAL; > + code <<= THRESHOLD_UPPER_LIMIT_SHIFT; > + reg_th &= ~THRESHOLD_UPPER_LIMIT_MASK; > + break; > + case TSENS_TRIP_STAGE1: > + if (code_chk >= hi_code) > + return -EINVAL; > + code <<= THRESHOLD_LOWER_LIMIT_SHIFT; > + reg_th &= ~THRESHOLD_LOWER_LIMIT_MASK; > + break; > + case TSENS_TRIP_STAGE0: > + code <<= THRESHOLD_MIN_LIMIT_SHIFT; > + reg_th &= ~THRESHOLD_MIN_LIMIT_MASK; > + break; > + default: > + return -EINVAL; > + } > + > + ret = regmap_write(priv->tm_map, THRESHOLD_ADDR, reg_th | code); > + if (ret) > + return ret; > + > + return 0; > +} > + > static const struct tsens_ops ops_8960 = { > .init = init_8960, > .calibrate = calibrate_8960, > @@ -456,6 +533,7 @@ static const struct tsens_ops ops_8960 = { > .disable = disable_8960, > .suspend = suspend_8960, > .resume = resume_8960, > + .set_trip_temp = set_trip_temp_ipq8064, > }; > > struct tsens_plat_data data_8960 = { > -- > 2.27.0 >
diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c index 20d0bfb10f1f..4ad65ab3fd18 100644 --- a/drivers/thermal/qcom/tsens-8960.c +++ b/drivers/thermal/qcom/tsens-8960.c @@ -93,6 +93,15 @@ TSENS_8064_SENSOR9_EN | \ TSENS_8064_SENSOR10_EN) +/* Trips: from very hot to very cold */ +enum tsens_trip_type { + TSENS_TRIP_STAGE3 = 0, + TSENS_TRIP_STAGE2, + TSENS_TRIP_STAGE1, + TSENS_TRIP_STAGE0, + TSENS_TRIP_NUM, +}; + u32 tsens_8960_slope[] = { 1176, 1176, 1154, 1176, 1111, 1132, 1132, 1199, @@ -110,6 +119,16 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s) return adc_code * slope + offset; } +static int mdegC_to_code(int degC, const struct tsens_sensor *s) +{ + int slope, offset; + + slope = thermal_zone_get_slope(s->tzd); + offset = CAL_MDEGC - slope * s->offset; + + return degC / slope - offset; +} + static void notify_uspace_tsens_fn(struct work_struct *work) { struct tsens_sensor *s = container_of(work, struct tsens_sensor, @@ -448,6 +467,64 @@ static int get_temp_8960(const struct tsens_sensor *s, int *temp) return -ETIMEDOUT; } +static int set_trip_temp_ipq8064(void *data, int trip, int temp) +{ + unsigned int reg_th, reg_cntl; + int ret, code, code_chk, hi_code, lo_code; + const struct tsens_sensor *s = data; + struct tsens_priv *priv = s->priv; + + code = mdegC_to_code(temp, s); + code_chk = code; + + if (code < THRESHOLD_MIN_CODE || code > THRESHOLD_MAX_CODE) + return -EINVAL; + + ret = regmap_read(priv->tm_map, STATUS_CNTL_ADDR_8064, ®_cntl); + if (ret) + return ret; + + ret = regmap_read(priv->tm_map, THRESHOLD_ADDR, ®_th); + if (ret) + return ret; + + hi_code = (reg_th & THRESHOLD_UPPER_LIMIT_MASK) + >> THRESHOLD_UPPER_LIMIT_SHIFT; + lo_code = (reg_th & THRESHOLD_LOWER_LIMIT_MASK) + >> THRESHOLD_LOWER_LIMIT_SHIFT; + + switch (trip) { + case TSENS_TRIP_STAGE3: + code <<= THRESHOLD_MAX_LIMIT_SHIFT; + reg_th &= ~THRESHOLD_MAX_LIMIT_MASK; + break; + case TSENS_TRIP_STAGE2: + if (code_chk <= lo_code) + return -EINVAL; + code <<= THRESHOLD_UPPER_LIMIT_SHIFT; + reg_th &= ~THRESHOLD_UPPER_LIMIT_MASK; + break; + case TSENS_TRIP_STAGE1: + if (code_chk >= hi_code) + return -EINVAL; + code <<= THRESHOLD_LOWER_LIMIT_SHIFT; + reg_th &= ~THRESHOLD_LOWER_LIMIT_MASK; + break; + case TSENS_TRIP_STAGE0: + code <<= THRESHOLD_MIN_LIMIT_SHIFT; + reg_th &= ~THRESHOLD_MIN_LIMIT_MASK; + break; + default: + return -EINVAL; + } + + ret = regmap_write(priv->tm_map, THRESHOLD_ADDR, reg_th | code); + if (ret) + return ret; + + return 0; +} + static const struct tsens_ops ops_8960 = { .init = init_8960, .calibrate = calibrate_8960, @@ -456,6 +533,7 @@ static const struct tsens_ops ops_8960 = { .disable = disable_8960, .suspend = suspend_8960, .resume = resume_8960, + .set_trip_temp = set_trip_temp_ipq8064, }; struct tsens_plat_data data_8960 = {
Add custom set_trip function for 8960 needed to set trip point to the tsens driver for 8960 driver. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> --- drivers/thermal/qcom/tsens-8960.c | 78 +++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)