[PATCH v4 2/9] staging: iio: ad7780: add filter reading to ad778x

Ardelean, Alexandru Alex.Ardelean at analog.com
Fri Mar 1 06:59:46 UTC 2019


On Thu, 2019-02-28 at 11:24 -0300, Renato Lui Geh wrote:
> 
> 
> This patch adds the new feature of reading the filter odr value for
> ad778x chips. This value is stored in the chip's state struct whenever a
> read or write call is performed on the chip's driver.
> 
> This feature requires sharing SAMP_FREQ. Since the ad717x does not have
> a filter option, the driver only shares the relevant info mask for the
> ad778x family.
> 
> Signed-off-by: Renato Lui Geh <renatogeh at gmail.com>
> ---
> Changes in v4:
>  - As mentioned in the previous patch, this was originally as part of
>    the 'add gain & filter gpio support' patch
> 

This needs the  ad778x_odr_avail[2] array to be moved to this patch.
Otherwise from what I can tell, this looks good.

>  drivers/staging/iio/adc/ad7780.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/iio/adc/ad7780.c
> b/drivers/staging/iio/adc/ad7780.c
> index 87fbcf510d45..7a68e90ddf14 100644
> --- a/drivers/staging/iio/adc/ad7780.c
> +++ b/drivers/staging/iio/adc/ad7780.c
> @@ -59,6 +59,7 @@ struct ad7780_state {
>         struct gpio_desc                *gain_gpio;
>         struct gpio_desc                *filter_gpio;
>         unsigned int                    gain;
> +       unsigned int                    odr;
>         unsigned int                    int_vref_mv;
> 
>         struct ad_sigma_delta sd;
> @@ -121,6 +122,9 @@ static int ad7780_read_raw(struct iio_dev *indio_dev,
>         case IIO_CHAN_INFO_OFFSET:
>                 *val = -(1 << (chan->scan_type.realbits - 1));
>                 return IIO_VAL_INT;
> +       case IIO_CHAN_INFO_SAMP_FREQ:
> +               *val = st->odr;
> +               return IIO_VAL_INT;
>         default:
>         break;
>         }
> @@ -163,6 +167,7 @@ static int ad7780_write_raw(struct iio_dev
> *indio_dev,
>                         val = 0;
>                 else
>                         val = 1;
> +               st->odr = ad778x_odr_avail[val];
>                 gpiod_set_value(st->filter_gpio, val);
>                 break;
>         default:
> @@ -184,6 +189,7 @@ static int ad7780_postprocess_sample(struct
> ad_sigma_delta *sigma_delta,
> 
>         if (chip_info->is_ad778x) {
>                 st->gain = ad778x_gain[raw_sample & AD7780_GAIN];
> +               st->odr = ad778x_odr_avail[raw_sample & AD7780_FILTER];
>         }
> 
>         return 0;
> @@ -196,17 +202,19 @@ static const struct ad_sigma_delta_info
> ad7780_sigma_delta_info = {
>  };
> 
>  #define AD7780_CHANNEL(bits, wordsize) \
> +       AD_SD_CHANNEL(1, 0, 0, bits, 32, wordsize - bits)
> +#define AD7170_CHANNEL(bits, wordsize) \
>         AD_SD_CHANNEL_NO_SAMP_FREQ(1, 0, 0, bits, 32, wordsize - bits)
> 
>  static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
>         [ID_AD7170] = {
> -               .channel = AD7780_CHANNEL(12, 24),
> +               .channel = AD7170_CHANNEL(12, 24),
>                 .pattern = AD7170_PATTERN,
>                 .pattern_mask = AD7170_PATTERN_MASK,
>                 .is_ad778x = false,
>         },
>         [ID_AD7171] = {
> -               .channel = AD7780_CHANNEL(16, 24),
> +               .channel = AD7170_CHANNEL(16, 24),
>                 .pattern = AD7170_PATTERN,
>                 .pattern_mask = AD7170_PATTERN_MASK,
>                 .is_ad778x = false,
> --
> 2.21.0
> 


More information about the devel mailing list