mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drivers: thermal: tsens: Introduce IP-specific max_sensor count

Browse source 
The IP can support 'm' sensors while the platform can enable 'n' sensors
of the 'm' where n <= m.

Track maximum sensors supported by the IP so that we can correctly track
what subset of the sensors are supported on the platform.

Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Amit Kucheria 2019-03-20 18:47:55 +05:30 committed by Eduardo Valentin
parent 66ad8a1009
commit 1b6e3e517f
4 changed files with 6 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/thermal/qcom/tsens-common.c
View file

@ -198,7 +198,7 @@ int __init init_common(struct tsens_priv *priv)
goto err_put_device; goto err_put_device;
} }
/* now alloc regmap_fields in tm_map */ /* now alloc regmap_fields in tm_map */
for (i = 0, j = LAST_TEMP_0; i < priv->num_sensors; i++, j++) { for (i = 0, j = LAST_TEMP_0; i < priv->feat->max_sensors; i++, j++) {
priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map, priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map,
priv->fields[j]); priv->fields[j]);
if (IS_ERR(priv->rf[j])) { if (IS_ERR(priv->rf[j])) {
@ -206,7 +206,7 @@ int __init init_common(struct tsens_priv *priv)
goto err_put_device; goto err_put_device;
} }
} }
for (i = 0, j = VALID_0; i < priv->num_sensors; i++, j++) { for (i = 0, j = VALID_0; i < priv->feat->max_sensors; i++, j++) {
priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map, priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map,
priv->fields[j]); priv->fields[j]);
if (IS_ERR(priv->rf[j])) { if (IS_ERR(priv->rf[j])) {

1
drivers/thermal/qcom/tsens-v0_1.c
View file

@ -324,6 +324,7 @@ static const struct tsens_features tsens_v0_1_feat = {
.crit_int = 0, .crit_int = 0,
.adc = 1, .adc = 1,
.srot_split = 1, .srot_split = 1,
.max_sensors = 11,
}; };
static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = { static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = {

1
drivers/thermal/qcom/tsens-v2.c
View file

@ -88,6 +88,7 @@ static const struct tsens_features tsens_v2_feat = {
.crit_int = 1, .crit_int = 1,
.adc = 0, .adc = 0,
.srot_split = 1, .srot_split = 1,
.max_sensors = 16,
}; };
static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = { static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = {

2
drivers/thermal/qcom/tsens.h
View file

@ -242,12 +242,14 @@ enum regfield_ids {
* @adc: do the sensors only output adc code (instead of temperature)? * @adc: do the sensors only output adc code (instead of temperature)?
* @srot_split: does the IP neatly splits the register space into SROT and TM, * @srot_split: does the IP neatly splits the register space into SROT and TM,
* with SROT only being available to secure boot firmware? * with SROT only being available to secure boot firmware?
* @max_sensors: maximum sensors supported by this version of the IP
*/ */
struct tsens_features { struct tsens_features {
unsigned int ver_major; unsigned int ver_major;
unsigned int crit_int:1; unsigned int crit_int:1;
unsigned int adc:1; unsigned int adc:1;
unsigned int srot_split:1; unsigned int srot_split:1;
unsigned int max_sensors;
}; };
/** /**