* [PATCH 0/2] Add ADC support for Colibri VF61 and implement temperature sensor for vf610-adc @ 2014-09-17 8:23 Sanchayan Maity 2014-09-17 8:23 ` [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support Sanchayan Maity 2014-09-17 8:23 ` [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support Sanchayan Maity 0 siblings, 2 replies; 7+ messages in thread From: Sanchayan Maity @ 2014-09-17 8:23 UTC (permalink / raw) To: shawn.guo Cc: stefan, B38611, linux, linux-arm-kernel, linux-kernel, jic23, linux-iio, Sanchayan Maity 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(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support 2014-09-17 8:23 [PATCH 0/2] Add ADC support for Colibri VF61 and implement temperature sensor for vf610-adc Sanchayan Maity @ 2014-09-17 8:23 ` Sanchayan Maity 2014-09-18 13:46 ` Shawn Guo 2014-09-17 8:23 ` [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support Sanchayan Maity 1 sibling, 1 reply; 7+ messages in thread From: Sanchayan Maity @ 2014-09-17 8:23 UTC (permalink / raw) To: shawn.guo Cc: stefan, B38611, linux, linux-arm-kernel, linux-kernel, jic23, linux-iio, Sanchayan Maity Enable ADC support for Colibri VF61 modules Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> --- arch/arm/boot/dts/vf610-colibri.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi index 0cd8343..275ebec 100644 --- a/arch/arm/boot/dts/vf610-colibri.dtsi +++ b/arch/arm/boot/dts/vf610-colibri.dtsi @@ -69,6 +69,16 @@ status = "okay"; }; +&adc0 { + pinctrl-names = "default"; + status = "okay"; +}; + +&adc1 { + pinctrl-names = "default"; + status = "okay"; +}; + &iomuxc { vf610-colibri { pinctrl_esdhc1: esdhc1grp { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support 2014-09-17 8:23 ` [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support Sanchayan Maity @ 2014-09-18 13:46 ` Shawn Guo 2014-09-19 9:55 ` Sanchayan Maity 0 siblings, 1 reply; 7+ messages in thread From: Shawn Guo @ 2014-09-18 13:46 UTC (permalink / raw) To: Sanchayan Maity Cc: stefan, B38611, linux, linux-arm-kernel, linux-kernel, jic23, linux-iio On Wed, Sep 17, 2014 at 01:53:16PM +0530, Sanchayan Maity wrote: > Enable ADC support for Colibri VF61 modules > > Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> > --- > arch/arm/boot/dts/vf610-colibri.dtsi | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi > index 0cd8343..275ebec 100644 > --- a/arch/arm/boot/dts/vf610-colibri.dtsi > +++ b/arch/arm/boot/dts/vf610-colibri.dtsi > @@ -69,6 +69,16 @@ > status = "okay"; > }; > > +&adc0 { > + pinctrl-names = "default"; > + status = "okay"; > +}; > + > +&adc1 { > + pinctrl-names = "default"; > + status = "okay"; > +}; > + Please sort the nodes alphabetically in node name. Shawn > &iomuxc { > vf610-colibri { > pinctrl_esdhc1: esdhc1grp { > -- > 1.7.9.5 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support 2014-09-18 13:46 ` Shawn Guo @ 2014-09-19 9:55 ` Sanchayan Maity 0 siblings, 0 replies; 7+ messages in thread From: Sanchayan Maity @ 2014-09-19 9:55 UTC (permalink / raw) To: Shawn Guo Cc: Stefan Agner, B38611, linux, linux-arm-kernel, linux-kernel, jic23, linux-iio >> Enable ADC support for Colibri VF61 modules >> >> Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> >> --- >> arch/arm/boot/dts/vf610-colibri.dtsi | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi >> index 0cd8343..275ebec 100644 >> --- a/arch/arm/boot/dts/vf610-colibri.dtsi >> +++ b/arch/arm/boot/dts/vf610-colibri.dtsi >> @@ -69,6 +69,16 @@ >> status = "okay"; >> }; >> >> +&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 > > Shawn > >> &iomuxc { >> vf610-colibri { >> pinctrl_esdhc1: esdhc1grp { >> -- >> 1.7.9.5 >> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support 2014-09-17 8:23 [PATCH 0/2] Add ADC support for Colibri VF61 and implement temperature sensor for vf610-adc Sanchayan Maity 2014-09-17 8:23 ` [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support Sanchayan Maity @ 2014-09-17 8:23 ` Sanchayan Maity 2014-09-17 8:37 ` Peter Meerwald 1 sibling, 1 reply; 7+ messages in thread From: Sanchayan Maity @ 2014-09-17 8:23 UTC (permalink / raw) To: shawn.guo Cc: stefan, B38611, linux, linux-arm-kernel, linux-kernel, jic23, linux-iio, Sanchayan Maity 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. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> --- drivers/iio/adc/vf610_adc.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c index 44799eb5..aa682aa 100644 --- a/drivers/iio/adc/vf610_adc.c +++ b/drivers/iio/adc/vf610_adc.c @@ -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; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support 2014-09-17 8:23 ` [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support Sanchayan Maity @ 2014-09-17 8:37 ` Peter Meerwald 2014-09-17 14:22 ` Sanchayan Maity 0 siblings, 1 reply; 7+ messages in thread From: Peter Meerwald @ 2014-09-17 8:37 UTC (permalink / raw) To: Sanchayan Maity; +Cc: shawn.guo, stefan, B38611, jic23, linux-iio [-- Attachment #1: Type: TEXT/PLAIN, Size: 3324 bytes --] > 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. the description is wrong, should be 'milli degree Celsius' more comments inline > Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> > --- > drivers/iio/adc/vf610_adc.c | 34 +++++++++++++++++++++++++++++++--- > 1 file changed, 31 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c > index 44799eb5..aa682aa 100644 > --- a/drivers/iio/adc/vf610_adc.c > +++ b/drivers/iio/adc/vf610_adc.c > @@ -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) { \ there is just one temperature channel, so not indexed > + .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 > +} > + > 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; why write info->value? I'd leave value u32 and only read value here *val = 25000 - (info->value - 864) * 1000000 / 1840; > + *val = info->value; > + break; > + default: this should return an error > + break; > + } > + > mutex_unlock(&indio_dev->mlock); > return IIO_VAL_INT; > > -- Peter Meerwald +43-664-2444418 (mobile) ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support 2014-09-17 8:37 ` Peter Meerwald @ 2014-09-17 14:22 ` Sanchayan Maity 0 siblings, 0 replies; 7+ messages in thread From: Sanchayan Maity @ 2014-09-17 14:22 UTC (permalink / raw) To: Peter Meerwald; +Cc: shawn.guo, Stefan Agner, B38611, jic23, linux-iio >> 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. > > the description is wrong, should be 'milli degree Celsius' Agreed. > > more comments inline > >> Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> >> --- >> drivers/iio/adc/vf610_adc.c | 34 +++++++++++++++++++++++++++++++--- >> 1 file changed, 31 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c >> index 44799eb5..aa682aa 100644 >> --- a/drivers/iio/adc/vf610_adc.c >> +++ b/drivers/iio/adc/vf610_adc.c >> @@ -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) { \ > there is just one temperature channel, so not indexed >> + .type =3D (_chan_type), \ >> + .indexed =3D 1, = \ >> + .channel =3D (_idx), = \ >> + .info_mask_separate =3D BIT(IIO_CHAN_INFO_PROCESSED), = \ >> + .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. > > 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. > >> +} >> + >> 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 { >> 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 =3D info->value; >> + switch (chan->type) { >> + case IIO_VOLTAGE: >> + *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; > > 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. > > *val =3D 25000 - (info->value - 864) * 1000000 / 1840; > >> + *val =3D info->value; >> + break; >> + default: > > this should return an error Ok. > >> + break; >> + } >> + >> mutex_unlock(&indio_dev->mlock); >> return IIO_VAL_INT; >> >> > > -- > > Peter Meerwald > +43-664-2444418 (mobile) ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-09-19 9:55 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-09-17 8:23 [PATCH 0/2] Add ADC support for Colibri VF61 and implement temperature sensor for vf610-adc Sanchayan Maity 2014-09-17 8:23 ` [PATCH 1/2] ARM: dts: vf610-colibri: Add ADC support Sanchayan Maity 2014-09-18 13:46 ` Shawn Guo 2014-09-19 9:55 ` Sanchayan Maity 2014-09-17 8:23 ` [PATCH 2/2] ARM: imx: vf610-adc: Add temperature sensor support Sanchayan Maity 2014-09-17 8:37 ` Peter Meerwald 2014-09-17 14:22 ` Sanchayan Maity
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).