drivers/iio/adc/vf610-adc: Add temperature sensor support
Subsystems (2)
PATCH v3 1/1 drivers/iio/adc/vf610-adc: Add temperature sensor support
Vybrid ADC peripheral 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 milli degree Celsius, which is returned using IIO_CHAN_INFO_PROCESSED option.
Changes since v2:
v2 and v1 patch were with "ARM: imx:" Cleaned this.
Changes since v1:
[1] Removed info scale, index and sampling frequency specification for temperature channel.
[2] Instead of having info->value as int for temperature calculation, kept it at u32 and only read value during temperature calculation
[v1] http://thread.gmane.org/gmane.linux.kernel.iio/13960/focus=13963
[v2] https://lkml.org/lkml/2014/9/18/161
Sanchayan Maity (1):
drivers/iio/adc/vf610-adc: Add temperature sensor support
drivers/iio/adc/vf610_adc.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.9.5
PATCH v3 1/1 drivers/iio/adc/vf610-adc: Add temperature sensor support
Vybrid ADC peripheral 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 milli degree Celsius, which is returned using IIO_CHAN_INFO_PROCESSED option.
--- drivers/iio/adc/vf610_adc.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/iio/adc/vf610_adc.c +26 -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
@@ -153,6 +153,12 @@ struct vf610_adc { BIT(IIO_CHAN_INFO_SAMP_FREQ), \ } +#define VF610_ADC_TEMPERATURE_CHAN (_idx, _chan_type) { \ + .type = (_chan_type), \ + .channel = (_idx), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), \ +} +static const struct iio_chan_spec vf610_adc_iio_channels[] = {VF610_ADC_CHAN (0 ,IIO_VOLTAGE ),VF610_ADC_CHAN (1 ,IIO_VOLTAGE ),
@@ -170,6 +176,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 +458,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 +476,23 @@ 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 696 mV +*/ + *val =25000 - ((int )info->value -864 ) *1000000 /1840 ; +break ; +default : +mutex_unlock (&indio_dev->mlock); +return -EINVAL ; + } +mutex_unlock (&indio_dev->mlock);return IIO_VAL_INT ;
Signature · 1 line
1.7.9.5
Jonathan Cameron
maintainerQuoted 7 lines · Sanchayan Maity
Vybrid ADC peripheral 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 milli degree Celsius, which is returned using
IIO_CHAN_INFO_PROCESSEDoption.Signed-off-by Sanchayan Maity <[email protected]>
Applied to the togreg branch of iio.git initially pushed out as testing for the autobuilders to play.
Amended the patch title to fit with the style we have somehow ended up with for IIO patches.
Thanks,
Jonathan
Quoted 72 lines
--- drivers/iio/adc/vf610_adc.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)drivers/iio/adc/vf610_adc.c +26
-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@@ -153,6 +153,12 @@ struct vf610_adc { BIT(IIO_CHAN_INFO_SAMP_FREQ), \ } +#define VF610_ADC_TEMPERATURE_CHAN (_idx, _chan_type) { \ + .type = (_chan_type), \ + .channel = (_idx), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), \ +} +static const struct iio_chan_spec vf610_adc_iio_channels[] = {VF610_ADC_CHAN (0 ,IIO_VOLTAGE ),VF610_ADC_CHAN (1 ,IIO_VOLTAGE ),@@ -170,6 +176,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 +458,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 +476,23 @@ 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 696 mV +*/ + *val =25000 - ((int )info->value -864 ) *1000000 /1840 ; +break ; +default : +mutex_unlock (&indio_dev->mlock); +return -EINVAL ; + } +mutex_unlock (&indio_dev->mlock);return IIO_VAL_INT ;