The Gateworks GSC hwmon driver supports multiple modes of ADC's. Add a
mode for 16-bit pre-scaled values and clarify that the existing pre-scale
mode is 24-bit.
Tim Harvey (2):
dt-bindings: mfd: gateworks-gsc: add 16bit pre-scaled voltage mode
hwmon: (gsc): add 16bit pre-scaled voltage mode
Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +++--
drivers/hwmon/gsc-hwmon.c | 8 +++++---
include/linux/platform_data/gsc_hwmon.h | 3 ++-
3 files changed, 10 insertions(+), 6 deletions(-)
--
2.7.4
add a 16-bit pre-scaled voltage mode to adc and clarify that existing
pre-scaled mode is 24bit.
Signed-off-by: Tim Harvey <[email protected]>
---
Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml b/Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
index 487a844..ceec33f 100644
--- a/Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
+++ b/Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
@@ -79,11 +79,12 @@ properties:
description: |
conversion mode:
0 - temperature, in C*10
- 1 - pre-scaled voltage value
+ 1 - pre-scaled 24-bit voltage value
2 - scaled voltage based on an optional resistor divider
and optional offset
+ 3 - pre-scaled 16-bit voltage value
$ref: /schemas/types.yaml#/definitions/uint32
- enum: [0, 1, 2]
+ enum: [0, 1, 2, 3]
gw,voltage-divider-ohms:
description: Values of resistors for divider on raw ADC input
--
2.7.4
add a 16-bit pre-scaled voltage mode to adc and clarify that existing
pre-scaled mode is 24bit.
Signed-off-by: Tim Harvey <[email protected]>
---
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,
};
--
2.7.4
On 6/9/20 7:57 AM, 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 <[email protected]>
For my reference:
Reviewed-by: Guenter Roeck <[email protected]>
We'll have to wait for DT approval.
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,
> };
>
>
On Tue, 09 Jun 2020 07:57:19 -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 <[email protected]>
> ---
> Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
Acked-by: Rob Herring <[email protected]>
On Tue, 09 Jun 2020, 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 <[email protected]>
> ---
> Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
Fixed the grammar in the subject and commit message.
Patch applied, thanks.
> diff --git a/Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml b/Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
> index 487a844..ceec33f 100644
> --- a/Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
> +++ b/Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
> @@ -79,11 +79,12 @@ properties:
> description: |
> conversion mode:
> 0 - temperature, in C*10
> - 1 - pre-scaled voltage value
> + 1 - pre-scaled 24-bit voltage value
> 2 - scaled voltage based on an optional resistor divider
> and optional offset
> + 3 - pre-scaled 16-bit voltage value
> $ref: /schemas/types.yaml#/definitions/uint32
> - enum: [0, 1, 2]
> + enum: [0, 1, 2, 3]
>
> gw,voltage-divider-ohms:
> description: Values of resistors for divider on raw ADC input
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
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 <[email protected]>
> Reviewed-by: Guenter Roeck <[email protected]>
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,
> };
>