iio: adc: ad7192: Add improvements and new feature
Subsystems (3)
cover iio: adc: ad7192: Add improvements and new feature
From: Alisa-Dariana Roman <[email protected]>
Dear maintainers,
I am submitting a series of patches to improve the ad7192 driver. I would like to highlight that patch 3 is dependent on patch 2. For patch 3 to be applied, patch 2 needs to be applied beforehand. Also, patch 1 upgrades the driver to match the style of the last two patches.
Please consider applying these patches in order.
Thank you for your time and attention.
Sincerely,
Alisa-Dariana Roman (3):
iio: adc: ad7192: Use bitfield access macros
iio: adc: ad7192: Improve f_order computation
iio: adc: ad7192: Add fast settling support
.../ABI/testing/sysfs-bus-iio-adc-ad7192 | 18 ++ drivers/iio/adc/ad7192.c | 230 +++++++++++++++--- 2 files changed, 208 insertions(+), 40 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/3 iio: adc: ad7192: Use bitfield access macros
From: Alisa-Dariana Roman <[email protected]>
Include bitfield.h and update driver to use bitfield access macros GENMASK, FIELD_PREP and FIELD_GET.
Also simplify AD7192_CONF_GAIN(-1) to AD7192_CONF_GAIN_MASK and AD7192_MODE_RATE(-1) to AD7192_MODE_RATE_MASK.
--- drivers/iio/adc/ad7192.c | 50 +++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-)
drivers/iio/adc/ad7192.c +32 -18
@@ -6,6 +6,7 @@*/ #include <linux/interrupt.h> +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/device.h> #include <linux/kernel.h>
@@ -43,7 +44,9 @@#define AD7192_COMM_WEN BIT(7)/* Write Enable */ #define AD7192_COMM_WRITE 0/* Write Operation */ #define AD7192_COMM_READ BIT(6)/* Read Operation */ -#define AD7192_COMM_ADDR (x) (((x) & 0x7) << 3)/* Register Address */ +#define AD7192_COMM_ADDR_MASK GENMASK(5, 3)/* Register Address Mask */ +#define AD7192_COMM_ADDR (x) FIELD_PREP(AD7192_COMM_ADDR_MASK, x) +/* Register Address */ #define AD7192_COMM_CREAD BIT(2)/* Continuous Read of Data Register */ /* Status Register Bit Designations (AD7192_REG_STAT) */
@@ -56,17 +59,24 @@#define AD7192_STAT_CH1 BIT(0)/* Channel 1 */ /* Mode Register Bit Designations (AD7192_REG_MODE) */ -#define AD7192_MODE_SEL (x) (((x) & 0x7) << 21)/* Operation Mode Select */ -#define AD7192_MODE_SEL_MASK (0x7 << 21)/* Operation Mode Select Mask */ -#define AD7192_MODE_STA (x) (((x) & 0x1) << 20)/* Status Register transmission */ +#define AD7192_MODE_SEL_MASK GENMASK(23, 21)/* Operation Mode Select Mask */ +#define AD7192_MODE_SEL (x) FIELD_PREP(AD7192_MODE_SEL_MASK, x) +/* Operation Mode Select */ #define AD7192_MODE_STA_MASK BIT(20)/* Status Register transmission Mask */ -#define AD7192_MODE_CLKSRC (x) (((x) & 0x3) << 18)/* Clock Source Select */ +#define AD7192_MODE_STA (x) FIELD_PREP(AD7192_MODE_STA_MASK, x) +/* Status Register transmission */ +#define AD7192_MODE_CLKSRC_MASK GENMASK(19, 18)/* Clock Source Select Mask */ +#define AD7192_MODE_CLKSRC (x) FIELD_PREP(AD7192_MODE_CLKSRC_MASK, x) +/* Clock Source Select */ #define AD7192_MODE_SINC3 BIT(15)/* SINC3 Filter Select */ #define AD7192_MODE_ENPAR BIT(13)/* Parity Enable */ #define AD7192_MODE_CLKDIV BIT(12)/* Clock divide by 2 (AD7190/2 only)*/ #define AD7192_MODE_SCYCLE BIT(11)/* Single cycle conversion */ #define AD7192_MODE_REJ60 BIT(10)/* 50/60Hz notch filter */ -#define AD7192_MODE_RATE (x) ((x) & 0x3FF)/* Filter Update Rate Select */ +#define AD7192_MODE_RATE_MASK GENMASK(9, 0) +/* Filter Update Rate Select Mask */ +#define AD7192_MODE_RATE (x) FIELD_PREP(AD7192_MODE_RATE_MASK, x) +/* Filter Update Rate Select */ /* Mode Register: AD7192_MODE_SEL options */ #define AD7192_MODE_CONT 0/* Continuous Conversion Mode */
@@ -92,13 +102,16 @@#define AD7192_CONF_CHOP BIT(23)/* CHOP enable */ #define AD7192_CONF_ACX BIT(22)/* AC excitation enable(AD7195 only) */ #define AD7192_CONF_REFSEL BIT(20)/* REFIN1/REFIN2 Reference Select */ -#define AD7192_CONF_CHAN (x) ((x) << 8)/* Channel select */ -#define AD7192_CONF_CHAN_MASK (0x7FF << 8)/* Channel select mask */ +#define AD7192_CONF_CHAN_MASK GENMASK(18, 8)/* Channel select mask */ +#define AD7192_CONF_CHAN (x) FIELD_PREP(AD7192_CONF_CHAN_MASK, x) +/* Channel select */ #define AD7192_CONF_BURN BIT(7)/* Burnout current enable */ #define AD7192_CONF_REFDET BIT(6)/* Reference detect enable */ #define AD7192_CONF_BUF BIT(4)/* Buffered Mode Enable */ #define AD7192_CONF_UNIPOLAR BIT(3)/* Unipolar/Bipolar Enable */ -#define AD7192_CONF_GAIN (x) ((x) & 0x7)/* Gain Select */ +#define AD7192_CONF_GAIN_MASK GENMASK(2, 0)/* Gain Select */ +#define AD7192_CONF_GAIN (x) FIELD_PREP(AD7192_CONF_GAIN_MASK, x) +/* Gain Select */ #define AD7192_CH_AIN1P_AIN2M BIT(0)/* AIN1(+) - AIN2(-) */ #define AD7192_CH_AIN3P_AIN4M BIT(1)/* AIN3(+) - AIN4(-) */
@@ -130,7 +143,7 @@#define CHIPID_AD7192 0x0#define CHIPID_AD7193 0x2#define CHIPID_AD7195 0x6 -#define AD7192_ID_MASK 0x0F +#define AD7192_ID_MASK GENMASK(3, 0)/* GPOCON Register Bit Designations (AD7192_REG_GPOCON) */ #define AD7192_GPOCON_BPDSW BIT(6)/* Bridge power-down switch enable */
@@ -399,7 +412,7 @@ static int ad7192_setup(struct iio_dev *indio_dev, struct device_node *np)if (ret)return ret; - id &=AD7192_ID_MASK ; + id =FIELD_GET (AD7192_ID_MASK , id);if (id != st->chip_info->chip_id) dev_warn(&st->sd.spi->dev, "device ID query failed (0x%X != 0x%X)\n",
@@ -472,7 +485,7 @@ static ssize_t ad7192_show_ac_excitation(struct device *dev,struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7192_state *st =iio_priv (indio_dev); -return sysfs_emit (buf,"%d\n" , !!(st->conf &AD7192_CONF_ACX )); +return sysfs_emit (buf,"%d\n" , !!FIELD_GET (AD7192_CONF_ACX , st->conf)); } static ssize_t ad7192_show_bridge_switch(struct device *dev,
@@ -482,7 +495,8 @@ static ssize_t ad7192_show_bridge_switch(struct device *dev,struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7192_state *st =iio_priv (indio_dev); -return sysfs_emit (buf,"%d\n" , !!(st->gpocon &AD7192_GPOCON_BPDSW )); +return sysfs_emit (buf,"%d\n" , + !!FIELD_GET (AD7192_GPOCON_BPDSW , st->gpocon)); } static ssize_t ad7192_set(struct device *dev,
@@ -667,9 +681,9 @@ static int ad7192_get_3db_filter_freq(struct ad7192_state *st) fadc =DIV_ROUND_CLOSEST (st->fclk, st->f_order *AD7192_MODE_RATE (st->mode)); -if (st->conf &AD7192_CONF_CHOP ) +if (FIELD_GET (AD7192_CONF_CHOP , st->conf))return DIV_ROUND_CLOSEST (fadc *240 ,1024 ); -if (st->mode &AD7192_MODE_SINC3 ) +if (FIELD_GET (AD7192_MODE_SINC3 , st->mode))return DIV_ROUND_CLOSEST (fadc *272 ,1024 );else return DIV_ROUND_CLOSEST (fadc *230 ,1024 );
@@ -682,7 +696,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, long m) {struct ad7192_state *st =iio_priv (indio_dev); -bool unipolar = !!(st->conf &AD7192_CONF_UNIPOLAR ); +bool unipolar = !!FIELD_GET (AD7192_CONF_UNIPOLAR , st->conf);switch (m) {case IIO_CHAN_INFO_RAW :
@@ -746,7 +760,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,if (val2 == st->scale_avail[i][1 ]) { ret =0 ; tmp = st->conf; - st->conf &= ~AD7192_CONF_GAIN (-1 ); + st->conf &= ~AD7192_CONF_GAIN_MASK ; st->conf |=AD7192_CONF_GAIN (i);if (tmp == st->conf)break ;
@@ -769,7 +783,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,break ; } - st->mode &= ~AD7192_MODE_RATE (-1 ); + st->mode &= ~AD7192_MODE_RATE_MASK ; st->mode |=AD7192_MODE_RATE (div);ad_sd_write_reg (&st->sd,AD7192_REG_MODE ,3 , st->mode);break ;
Signature · 1 line
2.34.1
Re: [PATCH 1/3] iio: adc: ad7192: Use bitfield access macros
Quoted 37 lines · On Tue, 19 Sep 2023 00:48:52 +0300 [email protected] wrote:
From: Alisa-Dariana Roman <[email protected]>
Include
bitfield.hand update driver to use bitfield access macros GENMASK,FIELD_PREPandFIELD_GET.Also simplify
AD7192_CONF_GAIN(-1)toAD7192_CONF_GAIN_MASKandAD7192_MODE_RATE(-1)toAD7192_MODE_RATE_MASK.Signed-off-by Alisa-Dariana Roman <[email protected]>--- drivers/iio/adc/ad7192.c | 50 +++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-)drivers/iio/adc/ad7192.c +4
-1@@ -6,6 +6,7 @@*/ #include <linux/interrupt.h> +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/device.h> #include <linux/kernel.h> @@ -43,7 +44,9 @@#define AD7192_COMM_WEN BIT(7)/* Write Enable */ #define AD7192_COMM_WRITE 0/* Write Operation */ #define AD7192_COMM_READ BIT(6)/* Read Operation */ -#define AD7192_COMM_ADDR (x) (((x) & 0x7) << 3)/* Register Address */ +#define AD7192_COMM_ADDR_MASK GENMASK(5, 3)/* Register Address Mask */ +#define AD7192_COMM_ADDR (x) FIELD_PREP(AD7192_COMM_ADDR_MASK, x) +/* Register Address */ #define AD7192_COMM_CREAD BIT(2)/* Continuous Read of Data Register */ /* Status Register Bit Designations (AD7192_REG_STAT) */
drivers/iio/adc/ad7192.c line 63
Quoted 8 lines
drivers/iio/adc/ad7192.c +2
-3@@ -56,17 +59,24 @@#define AD7192_STAT_CH1 BIT(0)/* Channel 1 */ /* Mode Register Bit Designations (AD7192_REG_MODE) */ -#define AD7192_MODE_SEL (x) (((x) & 0x7) << 21)/* Operation Mode Select */ -#define AD7192_MODE_SEL_MASK (0x7 << 21)/* Operation Mode Select Mask */ -#define AD7192_MODE_STA (x) (((x) & 0x1) << 20)/* Status Register transmission */ +#define AD7192_MODE_SEL_MASK GENMASK(23, 21)/* Operation Mode Select Mask */ +#define AD7192_MODE_SEL (x) FIELD_PREP(AD7192_MODE_SEL_MASK, x)
Hi Alisa-Dariana,
Whilst it is a bigger change, I'd ideally like all these XXX(x) calls to be replaced inline with the FIELD_PREP(). It is just as clear to read and in many cases better because you get patterns that go form
st->mode &= ~AD7192_MODE_SEL_MASK;st->mode |= AD7192_MODE_SEL(mode);
which becomes the more visible and obviousst->mode &= ~AD7192_MODE_SEL_MASK;st->mode |= FIELD_PREP(AD7192_MODE_SEL_MASK, mode);
where you can clearly see the same bits were removed from st->mode, then filled in with the new field value.
That's obscured with the additional macro.
Jonathan
Quoted 117 lines
drivers/iio/adc/ad7192.c +26
-14+/* Operation Mode Select */ #define AD7192_MODE_STA_MASK BIT(20)/* Status Register transmission Mask */ -#define AD7192_MODE_CLKSRC (x) (((x) & 0x3) << 18)/* Clock Source Select */ +#define AD7192_MODE_STA (x) FIELD_PREP(AD7192_MODE_STA_MASK, x) +/* Status Register transmission */ +#define AD7192_MODE_CLKSRC_MASK GENMASK(19, 18)/* Clock Source Select Mask */ +#define AD7192_MODE_CLKSRC (x) FIELD_PREP(AD7192_MODE_CLKSRC_MASK, x) +/* Clock Source Select */ #define AD7192_MODE_SINC3 BIT(15)/* SINC3 Filter Select */ #define AD7192_MODE_ENPAR BIT(13)/* Parity Enable */ #define AD7192_MODE_CLKDIV BIT(12)/* Clock divide by 2 (AD7190/2 only)*/ #define AD7192_MODE_SCYCLE BIT(11)/* Single cycle conversion */ #define AD7192_MODE_REJ60 BIT(10)/* 50/60Hz notch filter */ -#define AD7192_MODE_RATE (x) ((x) & 0x3FF)/* Filter Update Rate Select */ +#define AD7192_MODE_RATE_MASK GENMASK(9, 0) +/* Filter Update Rate Select Mask */ +#define AD7192_MODE_RATE (x) FIELD_PREP(AD7192_MODE_RATE_MASK, x) +/* Filter Update Rate Select */ /* Mode Register: AD7192_MODE_SEL options */ #define AD7192_MODE_CONT 0/* Continuous Conversion Mode */ @@ -92,13 +102,16 @@#define AD7192_CONF_CHOP BIT(23)/* CHOP enable */ #define AD7192_CONF_ACX BIT(22)/* AC excitation enable(AD7195 only) */ #define AD7192_CONF_REFSEL BIT(20)/* REFIN1/REFIN2 Reference Select */ -#define AD7192_CONF_CHAN (x) ((x) << 8)/* Channel select */ -#define AD7192_CONF_CHAN_MASK (0x7FF << 8)/* Channel select mask */ +#define AD7192_CONF_CHAN_MASK GENMASK(18, 8)/* Channel select mask */ +#define AD7192_CONF_CHAN (x) FIELD_PREP(AD7192_CONF_CHAN_MASK, x) +/* Channel select */ #define AD7192_CONF_BURN BIT(7)/* Burnout current enable */ #define AD7192_CONF_REFDET BIT(6)/* Reference detect enable */ #define AD7192_CONF_BUF BIT(4)/* Buffered Mode Enable */ #define AD7192_CONF_UNIPOLAR BIT(3)/* Unipolar/Bipolar Enable */ -#define AD7192_CONF_GAIN (x) ((x) & 0x7)/* Gain Select */ +#define AD7192_CONF_GAIN_MASK GENMASK(2, 0)/* Gain Select */ +#define AD7192_CONF_GAIN (x) FIELD_PREP(AD7192_CONF_GAIN_MASK, x) +/* Gain Select */ #define AD7192_CH_AIN1P_AIN2M BIT(0)/* AIN1(+) - AIN2(-) */ #define AD7192_CH_AIN3P_AIN4M BIT(1)/* AIN3(+) - AIN4(-) */ @@ -130,7 +143,7 @@#define CHIPID_AD7192 0x0#define CHIPID_AD7193 0x2#define CHIPID_AD7195 0x6 -#define AD7192_ID_MASK 0x0F +#define AD7192_ID_MASK GENMASK(3, 0)/* GPOCON Register Bit Designations (AD7192_REG_GPOCON) */ #define AD7192_GPOCON_BPDSW BIT(6)/* Bridge power-down switch enable */ @@ -399,7 +412,7 @@ static int ad7192_setup(struct iio_dev *indio_dev, struct device_node *np)if (ret)return ret; - id &=AD7192_ID_MASK ; + id =FIELD_GET (AD7192_ID_MASK , id);if (id != st->chip_info->chip_id) dev_warn(&st->sd.spi->dev, "device ID query failed (0x%X != 0x%X)\n",@@ -472,7 +485,7 @@ static ssize_t ad7192_show_ac_excitation(struct device *dev,struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7192_state *st =iio_priv (indio_dev); -return sysfs_emit (buf,"%d\n" , !!(st->conf &AD7192_CONF_ACX )); +return sysfs_emit (buf,"%d\n" , !!FIELD_GET (AD7192_CONF_ACX , st->conf)); } static ssize_t ad7192_show_bridge_switch(struct device *dev,@@ -482,7 +495,8 @@ static ssize_t ad7192_show_bridge_switch(struct device *dev,struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7192_state *st =iio_priv (indio_dev); -return sysfs_emit (buf,"%d\n" , !!(st->gpocon &AD7192_GPOCON_BPDSW )); +return sysfs_emit (buf,"%d\n" , + !!FIELD_GET (AD7192_GPOCON_BPDSW , st->gpocon)); } static ssize_t ad7192_set(struct device *dev,@@ -667,9 +681,9 @@ static int ad7192_get_3db_filter_freq(struct ad7192_state *st) fadc =DIV_ROUND_CLOSEST (st->fclk, st->f_order *AD7192_MODE_RATE (st->mode)); -if (st->conf &AD7192_CONF_CHOP ) +if (FIELD_GET (AD7192_CONF_CHOP , st->conf))return DIV_ROUND_CLOSEST (fadc *240 ,1024 ); -if (st->mode &AD7192_MODE_SINC3 ) +if (FIELD_GET (AD7192_MODE_SINC3 , st->mode))return DIV_ROUND_CLOSEST (fadc *272 ,1024 );else return DIV_ROUND_CLOSEST (fadc *230 ,1024 );@@ -682,7 +696,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, long m) {struct ad7192_state *st =iio_priv (indio_dev); -bool unipolar = !!(st->conf &AD7192_CONF_UNIPOLAR ); +bool unipolar = !!FIELD_GET (AD7192_CONF_UNIPOLAR , st->conf);switch (m) {case IIO_CHAN_INFO_RAW :@@ -746,7 +760,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,if (val2 == st->scale_avail[i][1 ]) { ret =0 ; tmp = st->conf; - st->conf &= ~AD7192_CONF_GAIN (-1 ); + st->conf &= ~AD7192_CONF_GAIN_MASK ; st->conf |=AD7192_CONF_GAIN (i);if (tmp == st->conf)break ;@@ -769,7 +783,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,break ; } - st->mode &= ~AD7192_MODE_RATE (-1 ); + st->mode &= ~AD7192_MODE_RATE_MASK ; st->mode |=AD7192_MODE_RATE (div);ad_sd_write_reg (&st->sd,AD7192_REG_MODE ,3 , st->mode);break ;
PATCH 2/3 iio: adc: ad7192: Improve f_order computation
In reply to [email protected]From: Alisa-Dariana Roman <[email protected]>
Instead of using the f_order member of ad7192_state, a function that computes the f_order coefficient makes more sense. This coefficient is a function of the sinc filter and chop filter states.
Remove f_order member of ad7192_state structure. Instead use ad7192_compute_f_order function to compute the f_order coefficient according to the sinc filter and chop filter states passed as parameters.
Add ad7192_get_f_order function that returns the current f_order coefficient of the device.
Add ad7192_compute_f_adc function that computes the f_adc value according to the sinc filter and chop filter states passed as parameters.
Add ad7192_get_f_adc function that returns the current f_adc value of the device.
--- drivers/iio/adc/ad7192.c | 62 +++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 16 deletions(-)
drivers/iio/adc/ad7192.c +46 -16
@@ -193,7 +193,6 @@ struct ad7192_state {struct clk *mclk;u16 int_vref_mv;u32 fclk; -u32 f_order;u32 mode;u32 conf;u32 scale_avail[8 ][2 ];
@@ -433,7 +432,6 @@ static int ad7192_setup(struct iio_dev *indio_dev, struct device_node *np) st->conf |=AD7192_CONF_REFSEL ; st->conf &= ~AD7192_CONF_CHOP ; - st->f_order =AD7192_NO_SYNC_FILTER ; buf_en =of_property_read_bool (np,"adi,buffer-enable" );if (buf_en)
@@ -544,22 +542,60 @@ static ssize_t ad7192_set(struct device *dev,return ret ? ret : len; } +static int ad7192_compute_f_order (bool sinc3_en,bool chop_en) +{ +if (!chop_en) +return 1 ; + +if (sinc3_en) +return AD7192_SYNC3_FILTER ; + +return AD7192_SYNC4_FILTER ; +} + +static int ad7192_get_f_order (struct ad7192_state *st) +{ +bool sinc3_en, chop_en; + + sinc3_en =FIELD_GET (AD7192_MODE_SINC3 , st->mode); + chop_en =FIELD_GET (AD7192_CONF_CHOP , st->conf); + +return ad7192_compute_f_order (sinc3_en, chop_en); +} + +static int ad7192_compute_f_adc (struct ad7192_state *st,bool sinc3_en, +bool chop_en) +{ +unsigned int f_order =ad7192_compute_f_order (sinc3_en, chop_en); + +return DIV_ROUND_CLOSEST (st->fclk, + f_order *AD7192_MODE_RATE (st->mode)); +} + +static int ad7192_get_f_adc (struct ad7192_state *st) +{ +unsigned int f_order =ad7192_get_f_order (st); + +return DIV_ROUND_CLOSEST (st->fclk, + f_order *AD7192_MODE_RATE (st->mode)); +} +static void ad7192_get_available_filter_freq (struct ad7192_state *st,int *freq) {unsigned int fadc;/* Formulas for filter at page 25 of the datasheet */ - fadc =DIV_ROUND_CLOSEST (st->fclk, -AD7192_SYNC4_FILTER *AD7192_MODE_RATE (st->mode)); + fadc =ad7192_compute_f_adc (st, false, true); freq[0 ] =DIV_ROUND_CLOSEST (fadc *240 ,1024 ); - fadc =DIV_ROUND_CLOSEST (st->fclk, -AD7192_SYNC3_FILTER *AD7192_MODE_RATE (st->mode)); + fadc =ad7192_compute_f_adc (st, true, true); freq[1 ] =DIV_ROUND_CLOSEST (fadc *240 ,1024 ); - fadc =DIV_ROUND_CLOSEST (st->fclk,AD7192_MODE_RATE (st->mode)); + fadc =ad7192_compute_f_adc (st, false, false); freq[2 ] =DIV_ROUND_CLOSEST (fadc *230 ,1024 ); + + fadc =ad7192_compute_f_adc (st, true, false); freq[3 ] =DIV_ROUND_CLOSEST (fadc *272 ,1024 ); }
@@ -642,25 +678,21 @@ static int ad7192_set_3db_filter_freq(struct ad7192_state *st,switch (idx) {case 0 : - st->f_order =AD7192_SYNC4_FILTER ; st->mode &= ~AD7192_MODE_SINC3 ; st->conf |=AD7192_CONF_CHOP ;break ;case 1 : - st->f_order =AD7192_SYNC3_FILTER ; st->mode |=AD7192_MODE_SINC3 ; st->conf |=AD7192_CONF_CHOP ;break ;case 2 : - st->f_order =AD7192_NO_SYNC_FILTER ; st->mode &= ~AD7192_MODE_SINC3 ; st->conf &= ~AD7192_CONF_CHOP ;break ;case 3 : - st->f_order =AD7192_NO_SYNC_FILTER ; st->mode |=AD7192_MODE_SINC3 ; st->conf &= ~AD7192_CONF_CHOP ;
@@ -678,8 +710,7 @@ static int ad7192_get_3db_filter_freq(struct ad7192_state *st) {unsigned int fadc; - fadc =DIV_ROUND_CLOSEST (st->fclk, - st->f_order *AD7192_MODE_RATE (st->mode)); + fadc =ad7192_get_f_adc (st);if (FIELD_GET (AD7192_CONF_CHOP , st->conf))return DIV_ROUND_CLOSEST (fadc *240 ,1024 );
@@ -726,8 +757,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, *val -=273 *ad7192_get_temp_scale (unipolar);return IIO_VAL_INT ;case IIO_CHAN_INFO_SAMP_FREQ : - *val = st->fclk / - (st->f_order *1024 *AD7192_MODE_RATE (st->mode)); + *val =DIV_ROUND_CLOSEST (ad7192_get_f_adc (st),1024 );return IIO_VAL_INT ;case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY : *val =ad7192_get_3db_filter_freq (st);
@@ -777,7 +807,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,break ; } - div = st->fclk / (val * st->f_order *1024 ); + div = st->fclk / (val *ad7192_get_f_order (st) *1024 );if (div <1 || div >1023 ) { ret = -EINVAL ;break ;
Signature · 1 line
2.34.1
PATCH 3/3 iio: adc: ad7192: Add fast settling support
In reply to [email protected]From: Alisa-Dariana Roman <[email protected]>
Add fast settling mode support for AD7193.
Add fast_settling_average_factor attribute. Expose to user the current value of the fast settling average factor. User can change the value by writing a new one.
Add fast_settling_average_factor_available attribute. Expose to user possible values for the fast settling average factor.
--- .../ABI/testing/sysfs-bus-iio-adc-ad7192 | 18 +++ drivers/iio/adc/ad7192.c | 130 ++++++++++++++++-- 2 files changed, 136 insertions(+), 12 deletions(-)
Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 +18 -0
@@ -19,6 +19,24 @@ Description: the bridge can be disconnected (when it is not being used using the bridge_switch_en attribute. +What: /sys/bus/iio/devices/iio:deviceX/fast_settling_average_factor +KernelVersion: +Contact: [email protected] +Description: + This attribute, if available, is used to activate or deactivate + fast settling mode and set the value of the average factor to + 1, 2, 8 or 16. If the average factor is set to 1, the fast + settling mode is disabled. The data from the sinc filter is + averaged by chosen value. The averaging reduces the output data + rate for a given FS word, however, the rms noise improves. + +What: /sys/bus/iio/devices/iio:deviceX/fast_settling_average_factor_available +KernelVersion: +Contact: [email protected] +Description: + Reading returns a list with the possible values for the fast + settling average factor: 1, 2, 8, 16. + What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration KernelVersion: Contact: [email protected]
drivers/iio/adc/ad7192.c +118 -12
234 lines not on this page · raw message
Signature · 1 line
2.34.1