On Tue, Jun 09, 2020 at 07:57:20AM -0700, Tim Harvey wrote:
> add a 16-bit pre-scaled voltage mode to adc and clarify that existing
> pre-scaled mode is 24bit.
>
> Signed-off-by: Tim Harvey <tharvey@xxxxxxxxxxxxx>
> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Applied.
Thanks,
Guenter
> ---
> drivers/hwmon/gsc-hwmon.c | 8 +++++---
> include/linux/platform_data/gsc_hwmon.h | 3 ++-
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwmon/gsc-hwmon.c b/drivers/hwmon/gsc-hwmon.c
> index 2137bc6..3dfe2ca 100644
> --- a/drivers/hwmon/gsc-hwmon.c
> +++ b/drivers/hwmon/gsc-hwmon.c
> @@ -159,7 +159,7 @@ gsc_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
> return -EOPNOTSUPP;
> }
>
> - sz = (ch->mode == mode_voltage) ? 3 : 2;
> + sz = (ch->mode == mode_voltage_24bit) ? 3 : 2;
> ret = regmap_bulk_read(hwmon->regmap, ch->reg, buf, sz);
> if (ret)
> return ret;
> @@ -186,7 +186,8 @@ gsc_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
> /* adjust by uV offset */
> tmp += ch->mvoffset;
> break;
> - case mode_voltage:
> + case mode_voltage_24bit:
> + case mode_voltage_16bit:
> /* no adjustment needed */
> break;
> }
> @@ -336,7 +337,8 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
> HWMON_T_LABEL;
> i_temp++;
> break;
> - case mode_voltage:
> + case mode_voltage_24bit:
> + case mode_voltage_16bit:
> case mode_voltage_raw:
> if (i_in == GSC_HWMON_MAX_IN_CH) {
> dev_err(gsc->dev, "too many input channels\n");
> diff --git a/include/linux/platform_data/gsc_hwmon.h b/include/linux/platform_data/gsc_hwmon.h
> index ec1611a..37a8f554d 100644
> --- a/include/linux/platform_data/gsc_hwmon.h
> +++ b/include/linux/platform_data/gsc_hwmon.h
> @@ -4,8 +4,9 @@
>
> enum gsc_hwmon_mode {
> mode_temperature,
> - mode_voltage,
> + mode_voltage_24bit,
> mode_voltage_raw,
> + mode_voltage_16bit,
> mode_max,
> };
>
