Add ADC support for Colibri VF61 and implement temperature sensor for vf610-adc
cover Add ADC support for Colibri VF61 and implement temperature sensor for vf610-adc
Add ADC nodes for Colibri VF61 modules.
Vybrid ADC module includes a temperature sensor which is connected to channel number 26. This patch adds support for the sensor. The raw value is read and the temperature calculated in degree Celsius which is returned using the IIO_CHAN_INFO_PROCESSED option.
Sanchayan Maity (2):
ARM: dts: vf610-colibri: Add ADC support
ARM: imx: vf610-adc: Add temperature sensor support
arch/arm/boot/dts/vf610-colibri.dtsi | 10 ++++++++++ drivers/iio/adc/vf610_adc.c | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/2 ARM: dts: vf610-colibri: Add ADC support
Enable ADC support for Colibri VF61 modules
--- arch/arm/boot/dts/vf610-colibri.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/vf610-colibri.dtsi +10 -0
@@ -69,6 +69,16 @@ status = "okay"; }; +&adc0 { + pinctrl-names = "default"; + status = "okay"; +}; + +&adc1 { + pinctrl-names = "default"; + status = "okay"; +}; + &iomuxc { vf610-colibri { pinctrl_esdhc1: esdhc1grp {
Signature · 1 line
1.7.9.5
PATCH 2/2 ARM: imx: vf610-adc: Add temperature sensor support
In reply to Sanchayan MaityVybrid ADC module includes a temperature sensor which is connected to channel number 26. This patch adds support for the sensor. The raw value is read and the temperature calculated in degree Celsius which is returned using the IIO_CHAN_INFO_PROCESSED option.
--- drivers/iio/adc/vf610_adc.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-)
drivers/iio/adc/vf610_adc.c +31 -3
@@ -91,7 +91,7 @@#define VF610_ADC_CAL 0x80/* Other field define */ -#define VF610_ADC_ADCHC (x) ((x) & 0xF) +#define VF610_ADC_ADCHC (x) ((x) & 0x1F)#define VF610_ADC_AIEN (0x1 << 7)#define VF610_ADC_CONV_DISABLE 0x1F#define VF610_ADC_HS_COCO0 0x1
@@ -137,7 +137,7 @@ struct vf610_adc {struct clk *clk;u32 vref_uv; -u32 value; +int value;struct regulator *vref;struct vf610_adc_feature adc_feature;
@@ -153,6 +153,15 @@ struct vf610_adc { BIT(IIO_CHAN_INFO_SAMP_FREQ), \ } +#define VF610_ADC_TEMPERATURE_CHAN (_idx, _chan_type) { \ + .type = (_chan_type), \ + .indexed = 1, \ + .channel = (_idx), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \ +} +static const struct iio_chan_spec vf610_adc_iio_channels[] = {VF610_ADC_CHAN (0 ,IIO_VOLTAGE ),VF610_ADC_CHAN (1 ,IIO_VOLTAGE ),
@@ -170,6 +179,7 @@ static const struct iio_chan_spec vf610_adc_iio_channels[] = {VF610_ADC_CHAN (13 ,IIO_VOLTAGE ),VF610_ADC_CHAN (14 ,IIO_VOLTAGE ),VF610_ADC_CHAN (15 ,IIO_VOLTAGE ), + VF610_ADC_TEMPERATURE_CHAN(26, IIO_TEMP), /* sentinel */ };
@@ -451,6 +461,7 @@ static int vf610_read_raw(struct iio_dev *indio_dev,switch (mask) {case IIO_CHAN_INFO_RAW : +case IIO_CHAN_INFO_PROCESSED :mutex_lock (&indio_dev->mlock);reinit_completion (&info->completion);
@@ -468,7 +479,24 @@ static int vf610_read_raw(struct iio_dev *indio_dev,return ret; } - *val = info->value; +switch (chan->type) { +case IIO_VOLTAGE : + *val = info->value; +break ; +case IIO_TEMP : +/* +* Calculate in degree celsius times 1000 +* Using sensor slope of 1.84 mV/?C and +* V at 25?C of 696mv +*/ + info->value -=864 ; + info->value =25000 - info->value *1000000 /1840 ; + *val = info->value; +break ; +default : +break ; + } +mutex_unlock (&indio_dev->mlock);return IIO_VAL_INT ;
Signature · 1 line
1.7.9.5
Re: [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support
Quoted 6 lines
Vybrid ADC module includes a temperature sensor which is connected to channel number 26. This patch adds support for the sensor. The raw value is read and the temperature calculated in degree Celsius which is returned using the
IIO_CHAN_INFO_PROCESSEDoption.
the description is wrong, should be 'milli degree Celsius'
more comments inline
Quoted 28 lines
Signed-off-by Sanchayan Maity <[email protected]>--- drivers/iio/adc/vf610_adc.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-)drivers/iio/adc/vf610_adc.c +2
-2@@ -91,7 +91,7 @@#define VF610_ADC_CAL 0x80/* Other field define */ -#define VF610_ADC_ADCHC (x) ((x) & 0xF) +#define VF610_ADC_ADCHC (x) ((x) & 0x1F)#define VF610_ADC_AIEN (0x1 << 7)#define VF610_ADC_CONV_DISABLE 0x1F#define VF610_ADC_HS_COCO0 0x1@@ -137,7 +137,7 @@ struct vf610_adc {struct clk *clk;u32 vref_uv; -u32 value; +int value;struct regulator *vref;struct vf610_adc_feature adc_feature;
drivers/iio/adc/vf610_adc.c struct vf610_adc { · line 156
Quoted 4 lines
drivers/iio/adc/vf610_adc.c +1
-0@@ -153,6 +153,15 @@ struct vf610_adc { BIT(IIO_CHAN_INFO_SAMP_FREQ), \ } +#define VF610_ADC_TEMPERATURE_CHAN (_idx, _chan_type) { \
there is just one temperature channel, so not indexed
drivers/iio/adc/vf610_adc.c struct vf610_adc { · line 162
Quoted 6 lines
drivers/iio/adc/vf610_adc.c +6
-0+ .type = (_chan_type), \ + .indexed = 1, \ + .channel = (_idx), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), \ + .info_mask_shared_by_type =BIT (IIO_CHAN_INFO_SCALE ) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \
no need for SCALE since temperature it is PROCESSED; maybe it would be better to expose RAW + offset/scale
I don't see how the sampling freq. can be separately controlled for the temperature channel
Quoted 28 lines
drivers/iio/adc/vf610_adc.c +6
-1+} +static const struct iio_chan_spec vf610_adc_iio_channels[] = {VF610_ADC_CHAN (0 ,IIO_VOLTAGE ),VF610_ADC_CHAN (1 ,IIO_VOLTAGE ),@@ -170,6 +179,7 @@ static const struct iio_chan_spec vf610_adc_iio_channels[] = {VF610_ADC_CHAN (13 ,IIO_VOLTAGE ),VF610_ADC_CHAN (14 ,IIO_VOLTAGE ),VF610_ADC_CHAN (15 ,IIO_VOLTAGE ), + VF610_ADC_TEMPERATURE_CHAN(26, IIO_TEMP), /* sentinel */ };@@ -451,6 +461,7 @@ static int vf610_read_raw(struct iio_dev *indio_dev,switch (mask) {case IIO_CHAN_INFO_RAW : +case IIO_CHAN_INFO_PROCESSED :mutex_lock (&indio_dev->mlock);reinit_completion (&info->completion);@@ -468,7 +479,24 @@ static int vf610_read_raw(struct iio_dev *indio_dev,return ret; } - *val = info->value; +switch (chan->type) { +case IIO_VOLTAGE :
drivers/iio/adc/vf610_adc.c static int vf610_read_raw(struct iio_dev *indio_dev, · line 493
Quoted 10 lines
drivers/iio/adc/vf610_adc.c +10
-0+ *val = info->value; +break ; +case IIO_TEMP : +/* +* Calculate in degree celsius times 1000 +* Using sensor slope of 1.84 mV/°C and +* V at 25°C of 696mv +*/ + info->value -=864 ; + info->value =25000 - info->value *1000000 /1840 ;
why write info->value?
I'd leave value u32 and only read value here
*val = 25000 - (info->value - 864) * 1000000 / 1840;
drivers/iio/adc/vf610_adc.c static int vf610_read_raw(struct iio_dev *indio_dev, · line 496
Quoted 3 lines
drivers/iio/adc/vf610_adc.c +3
-0+ *val = info->value; +break ; +default :
this should return an error
Quoted 7 lines
drivers/iio/adc/vf610_adc.c +3
-0+break ; + } +mutex_unlock (&indio_dev->mlock);return IIO_VAL_INT ;
Signature · 2 lines
Peter Meerwald +43-664-2444418 (mobile)
Re: [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support
Quoted 7 lines
Quoted 5 lines
Vybrid ADC module includes a temperature sensor which is connected to channel number 26. This patch adds support for the sensor. The raw value is read and the temperature calculated in degree Celsius which is returned using the
IIO_CHAN_INFO_PROCESSEDoption.the description is wrong, should be 'milli degree Celsius'
Agreed.
Quoted 30 lines
more comments inline
Quoted 27 lines
Signed-off-by Sanchayan Maity <[email protected]>--- drivers/iio/adc/vf610_adc.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-)drivers/iio/adc/vf610_adc.c +2
-2@@ -91,7 +91,7 @@#define VF610_ADC_CAL 0x80/* Other field define */ -#define VF610_ADC_ADCHC (x) ((x) & 0xF) +#define VF610_ADC_ADCHC (x) ((x) & 0x1F)#define VF610_ADC_AIEN (0x1 << 7)#define VF610_ADC_CONV_DISABLE 0x1F#define VF610_ADC_HS_COCO0 0x1@@ -137,7 +137,7 @@ struct vf610_adc {struct clk *clk;u32 vref_uv; -u32 value; +int value;struct regulator *vref;struct vf610_adc_feature adc_feature;
Quoted 8 lines
drivers/iio/adc/vf610_adc.c struct vf610_adc { · line 156
Quoted 5 lines
drivers/iio/adc/vf610_adc.c +1
-0@@ -153,6 +153,15 @@ struct vf610_adc { BIT(IIO_CHAN_INFO_SAMP_FREQ), \ } +#define VF610_ADC_TEMPERATURE_CHAN (_idx, _chan_type) { \there is just one temperature channel, so not indexed
Quoted 2 lines
drivers/iio/adc/vf610_adc.c +2
-0+ .type =3D (_chan_type), \ + .indexed =3D 1, =
\
Quoted 1 line
drivers/iio/adc/vf610_adc.c struct vf610_adc { · line 159
Quoted 1 line
drivers/iio/adc/vf610_adc.c +1
-0+ .channel =3D (_idx), =
\
Quoted 1 line
drivers/iio/adc/vf610_adc.c struct vf610_adc { · line 160
Quoted 1 line
drivers/iio/adc/vf610_adc.c +1
-0+ .info_mask_separate =3D BIT(IIO_CHAN_INFO_PROCESSED), =
\
Quoted 5 lines
drivers/iio/adc/vf610_adc.c struct vf610_adc { · line 162
Quoted 2 lines
drivers/iio/adc/vf610_adc.c +2
-0+ .info_mask_shared_by_type =3D BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \no need for SCALE since temperature it is PROCESSED; maybe it would be better to expose RAW + offset/scale
I believe it would be a better option to return the processed temperature value through sysfs for the user. I will remove the info scale for this.
Quoted 3 lines
I don't see how the sampling freq. can be separately controlled for the temperature channel
Yes, independent sampling frequency control is not available. Will purge this as well.
Quoted 7 lines
drivers/iio/adc/vf610_adc.c static const struct iio_chan_spec vf610_adc_iio_chan=
Quoted 7 lines
drivers/iio/adc/vf610_adc.c +2
-0+} + static const struct iio_chan_spec vf610_adc_iio_channels[] =3D {VF610_ADC_CHAN (0 ,IIO_VOLTAGE ),VF610_ADC_CHAN (1 ,IIO_VOLTAGE ),@@ -170,6 +179,7 @@ static const struct iio_chan_spec vf610_adc_iio_chan=
nels[] =3D {
Quoted 9 lines
Quoted 9 lines
drivers/iio/adc/vf610_adc.c +1
-0VF610_ADC_CHAN (13 ,IIO_VOLTAGE ),VF610_ADC_CHAN (14 ,IIO_VOLTAGE ),VF610_ADC_CHAN (15 ,IIO_VOLTAGE ), + VF610_ADC_TEMPERATURE_CHAN(26, IIO_TEMP), /* sentinel */ };@@ -451,6 +461,7 @@ static int vf610_read_raw(struct iio_dev *indio_dev,
Quoted 7 lines
drivers/iio/adc/vf610_adc.c static int vf610_read_raw(struct iio_dev *indio_dev=
Quoted 7 lines
drivers/iio/adc/vf610_adc.c +1
-0switch (mask) {case IIO_CHAN_INFO_RAW : +case IIO_CHAN_INFO_PROCESSED :mutex_lock (&indio_dev->mlock);reinit_completion (&info->completion);@@ -468,7 +479,24 @@ static int vf610_read_raw(struct iio_dev *indio_dev=
,
Quoted 16 lines
Quoted 6 lines
drivers/iio/adc/vf610_adc.c +2
-1return ret; } - *val =3D info->value; +switch (chan->type) { +case IIO_VOLTAGE :drivers/iio/adc/vf610_adc.c static int vf610_read_raw(struct iio_dev *indio_dev,
Quoted 10 lines
drivers/iio/adc/vf610_adc.c +10
-0+ *val =3D info->value; +break ; +case IIO_TEMP : +/* +* Calculate in degree celsius times 1000 +* Using sensor slope of 1.84 mV/=C2=B0C and +* V at 25=C2=B0C of 696mv +*/ + info->value -=3D 864; + info->value =3D 25000 - info->value * 1000000 / 18=
40;
Quoted 3 lines
why write
info->value?
I'd leave value u32 and only read value here
The temperature sensor in VF61 module has a negative temperature co-efficient. Using a signed integer allowed me to preserve the sign, which was required for the correct calculation of temperature. Will leave info->value at u32 and only do the read as suggested.
Quoted 8 lines
*val =3D 25000 - (
info->value- 864) * 1000000 / 1840;drivers/iio/adc/vf610_adc.c static int vf610_read_raw(struct iio_dev *indio_dev, · line 496
Quoted 3 lines
drivers/iio/adc/vf610_adc.c +3
-0+ *val =3D info->value; +break ; +default :this should return an error
Ok.
Quoted 13 lines
drivers/iio/adc/vf610_adc.c static int vf610_read_raw(struct iio_dev *indio_dev, · line 502
Quoted 8 lines
drivers/iio/adc/vf610_adc.c +3
-0+break ; + } +mutex_unlock (&indio_dev->mlock);return IIO_VAL_INT ;--
Peter Meerwald
+43-664-2444418 (mobile)
Re: [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support
In reply to Sanchayan MaityQuoted 15 lines · Sanchayan Maity
Enable ADC support for Colibri VF61 modules
Signed-off-by Sanchayan Maity <[email protected]>--- arch/arm/boot/dts/vf610-colibri.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)arch/arm/boot/dts/vf610-colibri.dtsi +0
-0@@ -69,6 +69,16 @@ status = "okay"; };
arch/arm/boot/dts/vf610-colibri.dtsi line 81
Quoted 10 lines
arch/arm/boot/dts/vf610-colibri.dtsi +10
-0+&adc0 { + pinctrl-names = "default"; + status = "okay"; +}; + +&adc1 { + pinctrl-names = "default"; + status = "okay"; +}; +
Please sort the nodes alphabetically in node name.
Shawn
Quoted 6 lines
arch/arm/boot/dts/vf610-colibri.dtsi +0
-0&iomuxc { vf610-colibri { pinctrl_esdhc1: esdhc1grp {Signature · 1 line
1.7.9.5
Re: [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support
Quoted 15 lines
Quoted 15 lines
Enable ADC support for Colibri VF61 modules
Signed-off-by Sanchayan Maity <[email protected]>--- arch/arm/boot/dts/vf610-colibri.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)arch/arm/boot/dts/vf610-colibri.dtsi +0
-0@@ -69,6 +69,16 @@ status = "okay"; };
Quoted 12 lines
arch/arm/boot/dts/vf610-colibri.dtsi line 81
Quoted 10 lines
arch/arm/boot/dts/vf610-colibri.dtsi +10
-0+&adc0 { + pinctrl-names = "default"; + status = "okay"; +}; + +&adc1 { + pinctrl-names = "default"; + status = "okay"; +}; +Please sort the nodes alphabetically in node name.
Thanks for the input. Will clean and resend.
Sanchayan
Quoted 9 lines
Shawn
Quoted 6 lines
arch/arm/boot/dts/vf610-colibri.dtsi +0
-1&iomuxc { vf610-colibri { pinctrl_esdhc1: esdhc1grp { --1.7.9.5