iio: adc: qcom-spmi-vadc: Use right ratiometric range for 8998,660,845
Subsystems (3)
PATCH 1/2 iio: adc: qcom-spmi-vadc: Use right ratiometric range for 8998,660,845
From: AngeloGioacchino Del Regno <[email protected]>
The ratiometric range for MSM8998, SDM630/636/660 and SDM845 is 1875mV instead of the standard 1800mV: address this by adding a new compatible "qcom,spmi-vadc-8998" and assigning the different range to the machines declaring this one.
--- drivers/iio/adc/qcom-spmi-vadc.c | 10 +++++++++- drivers/iio/adc/qcom-vadc-common.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-)
drivers/iio/adc/qcom-spmi-vadc.c +9 -1
@@ -101,6 +101,7 @@ struct vadc_channel_prop {* @dev: pointer to struct device. * @base: base address for the ADC peripheral. * @nchannels: number of VADC channels. +* @ratio_range: ratiometric range for ref points. * @chan_props: array of VADC channel properties. * @iio_chans: array of IIO channels specification. * @are_ref_measured: are reference points measured.
@@ -114,6 +115,7 @@ struct vadc_priv {struct device *dev;u16 base;unsigned int nchannels; +unsigned int ratio_range;struct vadc_channel_prop *chan_props;struct iio_chan_spec *iio_chans;bool are_ref_measured;
@@ -355,7 +357,7 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)u16 read_1, read_2;int ret; - vadc->graph[VADC_CALIB_RATIOMETRIC ].dx =VADC_RATIOMETRIC_RANGE ; + vadc->graph[VADC_CALIB_RATIOMETRIC ].dx = vadc->ratio_range; vadc->graph[VADC_CALIB_ABSOLUTE ].dx =VADC_ABSOLUTE_RANGE_UV ; prop =vadc_get_channel (vadc,VADC_REF_1250MV );
@@ -885,6 +887,11 @@ static int vadc_probe(struct platform_device *pdev)if (ret)return ret; +if (of_device_is_compatible (node,"qcom,spmi-vadc-8998" )) + vadc->ratio_range =VADC_RATIOMETRIC_RANGE_8998 ; +else + vadc->ratio_range =VADC_RATIOMETRIC_RANGE ; + irq_eoc =platform_get_irq (pdev,0 );if (irq_eoc <0 ) {if (irq_eoc == -EPROBE_DEFER || irq_eoc == -EINVAL )
@@ -918,6 +925,7 @@ static int vadc_probe(struct platform_device *pdev)static const struct of_device_id vadc_match_table[] = { { .compatible ="qcom,spmi-vadc" }, + { .compatible ="qcom-spmi-vadc-8998" }, { } };MODULE_DEVICE_TABLE (of, vadc_match_table);
drivers/iio/adc/qcom-vadc-common.h +1 -0
@@ -16,6 +16,7 @@#define VADC_ABSOLUTE_RANGE_UV 625000#define VADC_RATIOMETRIC_RANGE 1800 +#define VADC_RATIOMETRIC_RANGE_8998 1875#define VADC_DEF_PRESCALING 0/* 1:1 */ #define VADC_DEF_DECIMATION 0/* 512 */
Signature · 1 line
2.28.0
PATCH 2/2 dt-bindings: qcom-spmi-vadc: Document qcom,spmi-vadc-8998 compatible
From: AngeloGioacchino Del Regno <[email protected]>
This compatible is used in the qcom-spmi-vadc driver to select a variation in the ratiometric range, valid for MSM8998-style VADCs, like MSM8998 itself, SDM630, SDM636, SDM660, SDM845 and others.
--- Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml +1 -0
@@ -26,6 +26,7 @@ properties: - items: - enum: - qcom,spmi-vadc + - qcom,spmi-vadc-8998 - qcom,spmi-adc5 - qcom,spmi-adc-rev2 - qcom,spmi-adc7
Signature · 1 line
2.28.0
Jonathan Cameron
maintainerQuoted 8 lines · On Sat, 26 Sep 2020 15:10:08 +0200 [email protected] wrote:
From: AngeloGioacchino Del Regno <[email protected]>
The ratiometric range for MSM8998, SDM630/636/660 and SDM845 is 1875mV instead of the standard 1800mV: address this by adding a new compatible "qcom,spmi-vadc-8998" and assigning the different range to the machines declaring this one.
Signed-off-by AngeloGioacchino Del Regno <[email protected]>
Please resend series making sure to cc
[email protected]
From a quick glance, patch looks fine.
Thanks,
Jonathan
Quoted 66 lines
--- drivers/iio/adc/qcom-spmi-vadc.c | 10 +++++++++- drivers/iio/adc/qcom-vadc-common.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-)drivers/iio/adc/qcom-spmi-vadc.c +9
-1@@ -101,6 +101,7 @@ struct vadc_channel_prop {* @dev: pointer to struct device. * @base: base address for the ADC peripheral. * @nchannels: number of VADC channels. +* @ratio_range: ratiometric range for ref points. * @chan_props: array of VADC channel properties. * @iio_chans: array of IIO channels specification. * @are_ref_measured: are reference points measured. @@ -114,6 +115,7 @@ struct vadc_priv {struct device *dev;u16 base;unsigned int nchannels; +unsigned int ratio_range;struct vadc_channel_prop *chan_props;struct iio_chan_spec *iio_chans;bool are_ref_measured;@@ -355,7 +357,7 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)u16 read_1, read_2;int ret; - vadc->graph[VADC_CALIB_RATIOMETRIC ].dx =VADC_RATIOMETRIC_RANGE ; + vadc->graph[VADC_CALIB_RATIOMETRIC ].dx = vadc->ratio_range; vadc->graph[VADC_CALIB_ABSOLUTE ].dx =VADC_ABSOLUTE_RANGE_UV ; prop =vadc_get_channel (vadc,VADC_REF_1250MV );@@ -885,6 +887,11 @@ static int vadc_probe(struct platform_device *pdev)if (ret)return ret; +if (of_device_is_compatible (node,"qcom,spmi-vadc-8998" )) + vadc->ratio_range =VADC_RATIOMETRIC_RANGE_8998 ; +else + vadc->ratio_range =VADC_RATIOMETRIC_RANGE ; + irq_eoc =platform_get_irq (pdev,0 );if (irq_eoc <0 ) {if (irq_eoc == -EPROBE_DEFER || irq_eoc == -EINVAL )@@ -918,6 +925,7 @@ static int vadc_probe(struct platform_device *pdev)static const struct of_device_id vadc_match_table[] = { { .compatible ="qcom,spmi-vadc" }, + { .compatible ="qcom-spmi-vadc-8998" }, { } };MODULE_DEVICE_TABLE (of, vadc_match_table);drivers/iio/adc/qcom-vadc-common.h +1
-0@@ -16,6 +16,7 @@#define VADC_ABSOLUTE_RANGE_UV 625000#define VADC_RATIOMETRIC_RANGE 1800 +#define VADC_RATIOMETRIC_RANGE_8998 1875#define VADC_DEF_PRESCALING 0/* 1:1 */ #define VADC_DEF_DECIMATION 0/* 512 */