staging: iio: ad7780: move out of staging

Previously, the AD7780 driver only supported gpio for the 'powerdown' pin. This commit adds suppport for the 'gain' and 'filter' pin.

Signed-off-by Renato Lui Geh <[email protected]>

Signed-off-by Giuliano Belinassi <[email protected]>

Co-developed-by Giuliano Belinassi <[email protected]>

---
Changes in v3:
- Renamed ad7780_chip_info's filter to odr
- Renamed ad778x_filter to ad778x_odr_avail
- Changed vref variable from unsigned int to unsigned long long to avoid overflow
- Removed unnecessary AD_SD_CHANNEL macro
Changes in v4:
- Removed useless macro
- Added default case for switch to suppress warning
- Removed chunks belonging to filter reading, adding these as a patch for itself

 drivers/staging/iio/adc/ad7780.c | 90 +++++++++++++++++++++++++++++---
 1 file changed, 84 insertions(+), 6 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -0

index c4a85789c2db..87fbcf510d45 100644

drivers/staging/iio/adc/ad7780.c +4 -2

 struct ad7780_chip_info
        struct iio_chan_spec    channel;
        unsigned int            pattern_mask;

@@ -50,7 +56,10 @@ struct ad7780_state {
        const struct ad7780_chip_info   *chip_info;
        struct regulator                *reg;
        struct gpio_desc                *powerdown_gpio;
-       unsigned int    gain;
+       struct gpio_desc                *gain_gpio;
+       struct gpio_desc                *filter_gpio;
+       unsigned int                    gain;
+       unsigned int                    int_vref_mv;
 
        struct ad_sigma_delta sd;
 };

@@ -104,17 +113,65 @@ static int ad7780_read_raw(struct iio_dev
 *indio_dev,
                voltage_uv = regulator_get_voltage(st->reg);
                if (voltage_uv < 0)
                        return voltage_uv;
-               *val = (voltage_uv / 1000) * st->gain;

drivers/staging/iio/adc/ad7780.c +44 -1

        }
 
        return -EINVAL;
 }
 
+static int ad7780_write_raw(struct iio_dev *indio_dev,
+                           struct iio_chan_spec const *chan,
+                           int val,
+                           int val2,
+                           long m)
+{
+       struct ad7780_state *st = iio_priv(indio_dev);
+       const struct ad7780_chip_info *chip_info = st->chip_info;
+       unsigned long long vref;
+       unsigned int full_scale, gain;
+
+       if (!chip_info->is_ad778x)
+               return 0;
+
+       switch (m) {
+       case IIO_CHAN_INFO_SCALE:
+               if (val != 0)
+                       return -EINVAL;
+
+               vref = st->int_vref_mv * 1000000LL;
+               full_scale = 1 << (chip_info->channel.scan_type.realbits
- 1);
+               gain = DIV_ROUND_CLOSEST(vref, full_scale);
+               gain = DIV_ROUND_CLOSEST(gain, val2);
+               st->gain = gain;
+               if (gain < AD7780_GAIN_MIDPOINT)
+                       gain = 0;
+               else
+                       gain = 1;
+               gpiod_set_value(st->gain_gpio, gain);
+               break;
+       case IIO_CHAN_INFO_SAMP_FREQ:
+               if (1000*val + val2/1000 < AD7780_FILTER_MIDPOINT)
+                       val = 0;
+               else
+                       val = 1;
+               gpiod_set_value(st->filter_gpio, val);
+               break;
+       default:
+       break;
+       }
+
+       return 0;
+}
+
 static int ad7780_postprocess_sample(struct ad_sigma_delta *sigma_delta,
                                     unsigned int raw_sample)
 {

drivers/staging/iio/adc/ad7780.c +0 -0

        }
 

        return 0;

drivers/staging/iio/adc/ad7780.c +1 -0

@@ -173,6 +227,7 @@ static const struct ad7780_chip_info
 ad7780_chip_info_tbl[] = {
 
 static const struct iio_info ad7780_info = {
        .read_raw = ad7780_read_raw,
+       .write_raw = ad7780_write_raw,
 };
 

static int ad7780_probe(struct spi_device *spi)

drivers/staging/iio/adc/ad7780.c +14 -0

@@ -222,6 +277,29 @@ static int ad7780_probe(struct spi_device *spi)
                goto error_disable_reg;
        }
 
+       if (st->chip_info->is_ad778x) {
+               st->gain_gpio = devm_gpiod_get_optional(&spi->dev,
+                                                       "adi,gain",
+                                                       GPIOD_OUT_HIGH);
+               if (IS_ERR(st->gain_gpio)) {
+                       ret = PTR_ERR(st->gain_gpio);
+                       dev_err(&spi->dev, "Failed to request gain GPIO:
 %d\n",
+                               ret);
+                       goto error_disable_reg;
+               }
+
+               st->filter_gpio = devm_gpiod_get_optional(&spi->dev,
+                                                         "adi,filter",
+                                                         GPIOD_OUT_HIGH)

drivers/staging/iio/adc/ad7780.c +0 -0

        ret = ad_sd_setup_buffer_and_trigger(indio_dev);

        if (ret)
                goto error_disable_reg;

--
2.21.0

Quoted 30 lines · Renato Lui Geh

Previously, the AD7780 driver only supported gpio for the 'powerdown' pin. This commit adds suppport for the 'gain' and 'filter' pin.

Signed-off-by Renato Lui Geh <[email protected]>

Signed-off-by Giuliano Belinassi <[email protected]>

Co-developed-by Giuliano Belinassi <[email protected]>

---
Changes in v3:
- Renamed ad7780_chip_info's filter to odr
- Renamed ad778x_filter to ad778x_odr_avail
- Changed vref variable from unsigned int to unsigned long long to avoid overflow
- Removed unnecessary AD_SD_CHANNEL macro
Changes in v4:
- Removed useless macro
- Added default case for switch to suppress warning
- Removed chunks belonging to filter reading, adding these as a patch for itself

 drivers/staging/iio/adc/ad7780.c | 90 +++++++++++++++++++++++++++++---
 1 file changed, 84 insertions(+), 6 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -0

index c4a85789c2db..87fbcf510d45 100644

drivers/staging/iio/adc/ad7780.c line 46

Quoted 8 lines

drivers/staging/iio/adc/ad7780.c +5 -0

@@ -39,6 +39,12 @@
 #define AD7170_PATTERN         (AD7780_PAT0 | AD7170_PAT2)
 #define AD7170_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1 | AD7170_PAT2)
 
+#define AD7780_GAIN_MIDPOINT   64
+#define AD7780_FILTER_MIDPOINT 13350
+
+static const unsigned int ad778x_gain[2]      = { 1, 128 };
+static const unsigned int ad778x_odr_avail[2] = { 10000, 16700 };

ad778x_odr_avail[2] is not used in this patch, so it should probably go into the next one
(i.e. staging: iio: ad7780: add filter reading to ad778x )

one good way of catching stuff like this is to do interactive rebase and compile your driver on each patch to see if the compiler catches this; i suspect the compiler would have thrown an error for this change

Quoted 8 lines · Renato Lui Geh

Previously, the AD7780 driver only supported gpio for the 'powerdown' pin. This commit adds suppport for the 'gain' and 'filter' pin.

Signed-off-by Renato Lui Geh <[email protected]>

Signed-off-by Giuliano Belinassi <[email protected]>

Co-developed-by Giuliano Belinassi <[email protected]>

Quoted 22 lines

---
Changes in v3:
- Renamed ad7780_chip_info's filter to odr
- Renamed ad778x_filter to ad778x_odr_avail
- Changed vref variable from unsigned int to unsigned long long to avoid overflow
- Removed unnecessary AD_SD_CHANNEL macro
Changes in v4:
- Removed useless macro
- Added default case for switch to suppress warning
- Removed chunks belonging to filter reading, adding these as a patch for itself

 drivers/staging/iio/adc/ad7780.c | 90 +++++++++++++++++++++++++++++---
 1 file changed, 84 insertions(+), 6 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -0

index c4a85789c2db..87fbcf510d45 100644

drivers/staging/iio/adc/ad7780.c line 46

Quoted 8 lines

drivers/staging/iio/adc/ad7780.c +5 -0

@@ -39,6 +39,12 @@
 #define AD7170_PATTERN         (AD7780_PAT0 | AD7170_PAT2)
 #define AD7170_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1 | AD7170_PAT2)
 
+#define AD7780_GAIN_MIDPOINT   64
+#define AD7780_FILTER_MIDPOINT 13350
+
+static const unsigned int ad778x_gain[2]      = { 1, 128 };
+static const unsigned int ad778x_odr_avail[2] = { 10000, 16700 };  

ad778x_odr_avail[2] is not used in this patch, so it should probably go into the next one
(i.e. staging: iio: ad7780: add filter reading to ad778x )

one good way of catching stuff like this is to do interactive rebase and compile your driver on each patch to see if the compiler catches this; i suspect the compiler would have thrown an error for this change

Quoted 29 lines

drivers/staging/iio/adc/ad7780.c +7 -2

 struct ad7780_chip_info
        struct iio_chan_spec    channel;
        unsigned int            pattern_mask;

@@ -50,7 +56,10 @@ struct ad7780_state {
        const struct ad7780_chip_info   *chip_info;
        struct regulator                *reg;
        struct gpio_desc                *powerdown_gpio;
-       unsigned int    gain;
+       struct gpio_desc                *gain_gpio;
+       struct gpio_desc                *filter_gpio;
+       unsigned int                    gain;
+       unsigned int                    int_vref_mv;
 
        struct ad_sigma_delta sd;
 };

@@ -104,17 +113,65 @@ static int ad7780_read_raw(struct iio_dev
 *indio_dev,
                voltage_uv = regulator_get_voltage(st->reg);
                if (voltage_uv < 0)
                        return voltage_uv;
-               *val = (voltage_uv / 1000) * st->gain;
+               voltage_uv /= 1000;
+               *val = voltage_uv * st->gain;
                *val2 = chan->scan_type.realbits - 1;
+               st->int_vref_mv = voltage_uv;
                return IIO_VAL_FRACTIONAL_LOG2;
        case IIO_CHAN_INFO_OFFSET:
                *val = -(1 << (chan->scan_type.realbits - 1));

drivers/staging/iio/adc/ad7780.c static int ad7780_read_raw(struct iio_dev · line 126

Quoted 3 lines

drivers/staging/iio/adc/ad7780.c +2 -0

                return IIO_VAL_INT;
+       default:
+       break;  

The indentation of the break statement is inconsistent with other places. Still, it does not add much value adding this change as-is, since it does not change any behavior, and is not an element needed by this change (i.e. adding gain & filter support via gpios)

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +0 -0

        }
 
        return -EINVAL;
 }
 

drivers/staging/iio/adc/ad7780.c static int ad7780_read_raw(struct iio_dev · line 144

Quoted 13 lines

drivers/staging/iio/adc/ad7780.c +13 -0

+static int ad7780_write_raw(struct iio_dev *indio_dev,
+                           struct iio_chan_spec const *chan,
+                           int val,
+                           int val2,
+                           long m)
+{
+       struct ad7780_state *st = iio_priv(indio_dev);
+       const struct ad7780_chip_info *chip_info = st->chip_info;
+       unsigned long long vref;
+       unsigned int full_scale, gain;
+
+       if (!chip_info->is_ad778x)
+               return 0;

Quoted 36 lines

drivers/staging/iio/adc/ad7780.c +31 -1

+
+       switch (m) {
+       case IIO_CHAN_INFO_SCALE:
+               if (val != 0)
+                       return -EINVAL;
+
+               vref = st->int_vref_mv * 1000000LL;
+               full_scale = 1 << (chip_info->channel.scan_type.realbits
- 1);
+               gain = DIV_ROUND_CLOSEST(vref, full_scale);
+               gain = DIV_ROUND_CLOSEST(gain, val2);
+               st->gain = gain;
+               if (gain < AD7780_GAIN_MIDPOINT)
+                       gain = 0;
+               else
+                       gain = 1;
+               gpiod_set_value(st->gain_gpio, gain);
+               break;
+       case IIO_CHAN_INFO_SAMP_FREQ:
+               if (1000*val + val2/1000 < AD7780_FILTER_MIDPOINT)
+                       val = 0;
+               else
+                       val = 1;
+               gpiod_set_value(st->filter_gpio, val);
+               break;
+       default:
+       break;
+       }
+
+       return 0;
+}
+
 static int ad7780_postprocess_sample(struct ad_sigma_delta *sigma_delta,
                                     unsigned int raw_sample)
 {

drivers/staging/iio/adc/ad7780.c static int ad7780_postprocess_sample(struct · line 187

Quoted 9 lines

drivers/staging/iio/adc/ad7780.c +1 -4

@@ -126,10 +183,7 @@ static int ad7780_postprocess_sample(struct
 ad_sigma_delta *sigma_delta,
                return -EIO;
 
        if (chip_info->is_ad778x) {
-               if (raw_sample & AD7780_GAIN)
-                       st->gain = 1;
-               else
-                       st->gain = 128;
+               st->gain = ad778x_gain[raw_sample & AD7780_GAIN];  

The new ad778x_gain[] array could have been it's own patch, but from my side it's fine to leave it here.
I do like this change, but it's not a patch that semantically has to do anything with adding gain & filter gpio support.

Let's see what Jonathan says.

Quoted 32 lines

drivers/staging/iio/adc/ad7780.c +0 -0

        }
 

        return 0;

drivers/staging/iio/adc/ad7780.c +1 -0

@@ -173,6 +227,7 @@ static const struct ad7780_chip_info
 ad7780_chip_info_tbl[] = {
 
 static const struct iio_info ad7780_info = {
        .read_raw = ad7780_read_raw,
+       .write_raw = ad7780_write_raw,
 };
 

static int ad7780_probe(struct spi_device *spi)

drivers/staging/iio/adc/ad7780.c +14 -0

@@ -222,6 +277,29 @@ static int ad7780_probe(struct spi_device *spi)
                goto error_disable_reg;
        }
 
+       if (st->chip_info->is_ad778x) {
+               st->gain_gpio = devm_gpiod_get_optional(&spi->dev,
+                                                       "adi,gain",
+                                                       GPIOD_OUT_HIGH);
+               if (IS_ERR(st->gain_gpio)) {
+                       ret = PTR_ERR(st->gain_gpio);
+                       dev_err(&spi->dev, "Failed to request gain GPIO:
 %d\n",
+                               ret);
+                       goto error_disable_reg;
+               }
+
+               st->filter_gpio = devm_gpiod_get_optional(&spi->dev,
+                                                         "adi,filter",
+                                                         GPIOD_OUT_HIGH)

drivers/staging/iio/adc/ad7780.c static int ad7780_probe(struct spi_device *spi) · line 304

Quoted 10 lines

drivers/staging/iio/adc/ad7780.c +9 -0

 ;
+               if (IS_ERR(st->filter_gpio)) {
+                       ret = PTR_ERR(st->filter_gpio);
+                       dev_err(&spi->dev,
+                               "Failed to request filter GPIO: %d\n",
+                               ret);
+                       goto error_disable_reg;
+               }
+       }
+  

This is just a preference of mine [feel free to ignore for this patch]. But, for this block of code, I would have added a separate function [ called something like ad7780_init_gpios(struct device *dev, struct ad7780_state *st) )

you could also move the powerdown gpio there; and do something like

static int ad7780_init_gpios(struct device *dev, struct ad7780_state *st) {

      st->powerdown_gpio = devm_gpiod_get_optional(dev,
                                                     "powerdown",
                                                     GPIOD_OUT_LOW);
        if (IS_ERR(st->powerdown_gpio)) {
              ret = PTR_ERR(st->powerdown_gpio);
              dev_err(dev, "Failed to request powerdown GPIO: %d\n", ret);
              return ret;
        }

       /**
        * Note Alex: I'm a big fan of keeping things to a minimal 
        * indentation level [especially where things can be elegant], 
        * but that's a preference of mine
        */

       if (!st->chip_info->is_ad778x)
           return 0;


        st->gain_gpio = devm_gpiod_get_optional(dev,
                        "adi,gain",
                        GPIOD_OUT_HIGH);
        if (IS_ERR(st->gain_gpio)) {
                ret = PTR_ERR(st->gain_gpio);
                dev_err(dev, "Failed to request gain GPIO: %d\n", ret);
                return ret;
        }

        st->filter_gpio = devm_gpiod_get_optional(dev,
                        "adi,filter",
                        GPIOD_OUT_HIGH);

        if (IS_ERR(st->filter_gpio)) {
                ret = PTR_ERR(st->filter_gpio);
                dev_err(dev, "Failed to request filter GPIO: %d\n", ret);
                return ret;
        }

        return 0;
}

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +0 -0

        ret = ad_sd_setup_buffer_and_trigger(indio_dev);

        if (ret)
                goto error_disable_reg;

--
2.21.0

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 <[email protected]>

---
Changes in v4:
- As mentioned in the previous patch, this was originally as part of the 'add gain & filter gpio support' patch

 drivers/staging/iio/adc/ad7780.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

drivers/staging/iio/adc/ad7780.c +5 -0

index 87fbcf510d45..7a68e90ddf14 100644
@@ -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:

drivers/staging/iio/adc/ad7780.c +1 -0

@@ -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;

drivers/staging/iio/adc/ad7780.c +4 -2

@@ -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

The AD7780 driver contains status pattern bits designed for checking whether serial transfers have been correctly performed. Pattern macros were previously generated through bit fields. This patch sets good pattern values directly and masks through GENMASK.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

drivers/staging/iio/adc/ad7780.c +1 -0

index 7a68e90ddf14..56c49e28f432 100644
@@ -17,6 +17,7 @@
 #include <linux/sched.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
+#include <linux/bits.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>

drivers/staging/iio/adc/ad7780.c +6 -6

-#define AD7170_PATTERN         (AD7780_PAT0 | AD7170_PAT2)
-#define AD7170_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1 | AD7170_PAT2)
+#define AD7170_PATTERN_GOOD    5
+#define AD7170_PATTERN_MASK    GENMASK(2, 0)
 
 #define AD7780_GAIN_MIDPOINT   64
 #define AD7780_FILTER_MIDPOINT 13350

@@ -209,25 +207,25 @@ static const struct ad_sigma_delta_info
 ad7780_sigma_delta_info = {
 static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
        [ID_AD7170] = {
                .channel = AD7170_CHANNEL(12, 24),
-               .pattern = AD7170_PATTERN,
+               .pattern = AD7170_PATTERN_GOOD,
                .pattern_mask = AD7170_PATTERN_MASK,
                .is_ad778x = false,
        },
        [ID_AD7171] = {
                .channel = AD7170_CHANNEL(16, 24),
-               .pattern = AD7170_PATTERN,
+               .pattern = AD7170_PATTERN_GOOD,
                .pattern_mask = AD7170_PATTERN_MASK,
                .is_ad778x = false,
        },
        [ID_AD7780] = {
                .channel = AD7780_CHANNEL(24, 32),
-               .pattern = AD7780_PATTERN,
+               .pattern = AD7780_PATTERN_GOOD,
                .pattern_mask = AD7780_PATTERN_MASK,
                .is_ad778x = true,
        },
        [ID_AD7781] = {
                .channel = AD7780_CHANNEL(20, 32),
-               .pattern = AD7780_PATTERN,
+               .pattern = AD7780_PATTERN_GOOD,
                .pattern_mask = AD7780_PATTERN_MASK,
                .is_ad778x = true,

        },

--
2.21.0

Quoted 26 lines · Renato Lui Geh

The AD7780 driver contains status pattern bits designed for checking whether serial transfers have been correctly performed. Pattern macros were previously generated through bit fields. This patch sets good pattern values directly and masks through GENMASK.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

drivers/staging/iio/adc/ad7780.c +1 -0

index 7a68e90ddf14..56c49e28f432 100644
@@ -17,6 +17,7 @@
 #include <linux/sched.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
+#include <linux/bits.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>

drivers/staging/iio/adc/ad7780.c line 32

Quoted 5 lines

drivers/staging/iio/adc/ad7780.c +0 -2

@@ -28,16 +29,13 @@
 #define AD7780_ID1             BIT(4)
 #define AD7780_ID0             BIT(3)
 #define AD7780_GAIN            BIT(2)
-#define AD7780_PAT1            BIT(1)
-#define AD7780_PAT0            BIT(0)  

I don't see a problem to leave the bitfields; they can be read & matched easier with the datasheet.

Quoted 4 lines

drivers/staging/iio/adc/ad7780.c +0 -2

-#define AD7780_PATTERN         (AD7780_PAT0)
-#define AD7780_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1)
 

drivers/staging/iio/adc/ad7780.c line 34

Quoted 3 lines

drivers/staging/iio/adc/ad7780.c +1 -1

-#define AD7170_PAT2            BIT(2)  
 
+#define AD7780_PATTERN_GOOD    1  

It was also nice before that the PAT0..PAT2 bitfields were used to define a good pattern, since it's easier to match with the datasheet.

drivers/staging/iio/adc/ad7780.c line 35

Quoted 3 lines

drivers/staging/iio/adc/ad7780.c +1 -0

+#define AD7780_PATTERN_MASK    GENMASK(1, 0)  

I like the general usage of GENMASK, but I'm not sure in this case it's worth doing. Maybe I missed a discussion somewhere, about doing this change, but it is mostly a cosmetic without any functional change.

Quoted 42 lines

drivers/staging/iio/adc/ad7780.c +6 -6

-#define AD7170_PATTERN         (AD7780_PAT0 | AD7170_PAT2)
-#define AD7170_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1 | AD7170_PAT2)
+#define AD7170_PATTERN_GOOD    5
+#define AD7170_PATTERN_MASK    GENMASK(2, 0)
 
 #define AD7780_GAIN_MIDPOINT   64
 #define AD7780_FILTER_MIDPOINT 13350

@@ -209,25 +207,25 @@ static const struct ad_sigma_delta_info
 ad7780_sigma_delta_info = {
 static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
        [ID_AD7170] = {
                .channel = AD7170_CHANNEL(12, 24),
-               .pattern = AD7170_PATTERN,
+               .pattern = AD7170_PATTERN_GOOD,
                .pattern_mask = AD7170_PATTERN_MASK,
                .is_ad778x = false,
        },
        [ID_AD7171] = {
                .channel = AD7170_CHANNEL(16, 24),
-               .pattern = AD7170_PATTERN,
+               .pattern = AD7170_PATTERN_GOOD,
                .pattern_mask = AD7170_PATTERN_MASK,
                .is_ad778x = false,
        },
        [ID_AD7780] = {
                .channel = AD7780_CHANNEL(24, 32),
-               .pattern = AD7780_PATTERN,
+               .pattern = AD7780_PATTERN_GOOD,
                .pattern_mask = AD7780_PATTERN_MASK,
                .is_ad778x = true,
        },
        [ID_AD7781] = {
                .channel = AD7780_CHANNEL(20, 32),
-               .pattern = AD7780_PATTERN,
+               .pattern = AD7780_PATTERN_GOOD,
                .pattern_mask = AD7780_PATTERN_MASK,
                .is_ad778x = true,

        },

--
2.21.0

Quoted 40 lines · Alexandru

Quoted 26 lines · Renato Lui Geh

The AD7780 driver contains status pattern bits designed for checking whether serial transfers have been correctly performed. Pattern macros were previously generated through bit fields. This patch sets good pattern values directly and masks through GENMASK.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

drivers/staging/iio/adc/ad7780.c +1 -0

index 7a68e90ddf14..56c49e28f432 100644
@@ -17,6 +17,7 @@
 #include <linux/sched.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
+#include <linux/bits.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>

drivers/staging/iio/adc/ad7780.c line 32

Quoted 5 lines

drivers/staging/iio/adc/ad7780.c +0 -2

@@ -28,16 +29,13 @@
 #define AD7780_ID1             BIT(4)
 #define AD7780_ID0             BIT(3)
 #define AD7780_GAIN            BIT(2)
-#define AD7780_PAT1            BIT(1)
-#define AD7780_PAT0            BIT(0)    

I don't see a problem to leave the bitfields; they can be read & matched easier with the datasheet.

Quoted 4 lines

drivers/staging/iio/adc/ad7780.c +0 -2

-#define AD7780_PATTERN         (AD7780_PAT0)
-#define AD7780_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1)
 

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c line 34

Quoted 3 lines

drivers/staging/iio/adc/ad7780.c +1 -1

-#define AD7170_PAT2            BIT(2)    
 
+#define AD7780_PATTERN_GOOD    1    

It was also nice before that the PAT0..PAT2 bitfields were used to define a good pattern, since it's easier to match with the datasheet.

This one was much suggestion. Not particularly important one.

Personally if a datasheet is pointlessly confusing I tend to ignore it. This is a two bit field as the bits don't have independent meaning!

I'm not strongly tied to it though and as it's an Analog driver and you all do a good job maintaining the set I'll go with your preference! I do prefer the naming of PATTERN_GOOD though if nothing else!

Quoted 51 lines

drivers/staging/iio/adc/ad7780.c line 35

Quoted 3 lines

drivers/staging/iio/adc/ad7780.c +1 -0

+#define AD7780_PATTERN_MASK    GENMASK(1, 0)    

I like the general usage of GENMASK, but I'm not sure in this case it's worth doing. Maybe I missed a discussion somewhere, about doing this change, but it is mostly a cosmetic without any functional change.

Quoted 42 lines

drivers/staging/iio/adc/ad7780.c +6 -6

-#define AD7170_PATTERN         (AD7780_PAT0 | AD7170_PAT2)
-#define AD7170_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1 | AD7170_PAT2)
+#define AD7170_PATTERN_GOOD    5
+#define AD7170_PATTERN_MASK    GENMASK(2, 0)
 
 #define AD7780_GAIN_MIDPOINT   64
 #define AD7780_FILTER_MIDPOINT 13350

@@ -209,25 +207,25 @@ static const struct ad_sigma_delta_info
 ad7780_sigma_delta_info = {
 static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
        [ID_AD7170] = {
                .channel = AD7170_CHANNEL(12, 24),
-               .pattern = AD7170_PATTERN,
+               .pattern = AD7170_PATTERN_GOOD,
                .pattern_mask = AD7170_PATTERN_MASK,
                .is_ad778x = false,
        },
        [ID_AD7171] = {
                .channel = AD7170_CHANNEL(16, 24),
-               .pattern = AD7170_PATTERN,
+               .pattern = AD7170_PATTERN_GOOD,
                .pattern_mask = AD7170_PATTERN_MASK,
                .is_ad778x = false,
        },
        [ID_AD7780] = {
                .channel = AD7780_CHANNEL(24, 32),
-               .pattern = AD7780_PATTERN,
+               .pattern = AD7780_PATTERN_GOOD,
                .pattern_mask = AD7780_PATTERN_MASK,
                .is_ad778x = true,
        },
        [ID_AD7781] = {
                .channel = AD7780_CHANNEL(20, 32),
-               .pattern = AD7780_PATTERN,
+               .pattern = AD7780_PATTERN_GOOD,
                .pattern_mask = AD7780_PATTERN_MASK,
                .is_ad778x = true,

        },

--
2.21.0

[External]

Quoted 53 lines · On Sat, 2 Mar 2019 19:07:16 +0000 Jonathan Cameron <[email protected]> wrote:

Quoted 49 lines · Alexandru

Quoted 28 lines · Renato Lui Geh

The AD7780 driver contains status pattern bits designed for checking
whether serial transfers have been correctly performed. Pattern macros
were previously generated through bit fields. This patch sets good pattern values directly and masks through GENMASK.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

drivers/staging/iio/adc/ad7780.c +1 -0

index 7a68e90ddf14..56c49e28f432 100644
@@ -17,6 +17,7 @@
 #include <linux/sched.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
+#include <linux/bits.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>

drivers/staging/iio/adc/ad7780.c line 32

Quoted 5 lines

drivers/staging/iio/adc/ad7780.c +0 -2

@@ -28,16 +29,13 @@
 #define AD7780_ID1             BIT(4)
 #define AD7780_ID0             BIT(3)
 #define AD7780_GAIN            BIT(2)
-#define AD7780_PAT1            BIT(1)
-#define AD7780_PAT0            BIT(0)

I don't see a problem to leave the bitfields; they can be read & matched
easier with the datasheet.

drivers/staging/iio/adc/ad7780.c line 33

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +1 -3

-#define AD7780_PATTERN         (AD7780_PAT0)
-#define AD7780_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1)
 
-#define AD7170_PAT2            BIT(2)
+#define AD7780_PATTERN_GOOD    1

It was also nice before that the PAT0..PAT2 bitfields were used to define a
good pattern, since it's easier to match with the datasheet.

Quoted 1 line

This one was much suggestion. Not particularly important one.

Not enough sleep this week clearly :)
This one was _my_ suggestion.

Quoted 61 lines

Personally if a datasheet is pointlessly confusing I tend to ignore it. This is a two bit field as the bits don't have independent meaning!

I'm not strongly tied to it though and as it's an Analog driver and you all do a good job maintaining the set I'll go with your preference! I do prefer the naming of PATTERN_GOOD though if nothing else!

Quoted 53 lines

drivers/staging/iio/adc/ad7780.c line 34

Quoted 3 lines

drivers/staging/iio/adc/ad7780.c +1 -0

+#define AD7780_PATTERN_MASK    GENMASK(1, 0)

I like the general usage of GENMASK, but I'm not sure in this case it's
worth doing. Maybe I missed a discussion somewhere, about doing this change, but it is mostly a cosmetic without any functional change.

Quoted 43 lines

drivers/staging/iio/adc/ad7780.c +6 -6

-#define AD7170_PATTERN         (AD7780_PAT0 | AD7170_PAT2)
-#define AD7170_PATTERN_MASK    (AD7780_PAT0 | AD7780_PAT1 |
 AD7170_PAT2)
+#define AD7170_PATTERN_GOOD    5
+#define AD7170_PATTERN_MASK    GENMASK(2, 0)
 
 #define AD7780_GAIN_MIDPOINT   64
 #define AD7780_FILTER_MIDPOINT 13350

@@ -209,25 +207,25 @@ static const struct ad_sigma_delta_info
 ad7780_sigma_delta_info = {
 static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
        [ID_AD7170] = {
                .channel = AD7170_CHANNEL(12, 24),
-               .pattern = AD7170_PATTERN,
+               .pattern = AD7170_PATTERN_GOOD,
                .pattern_mask = AD7170_PATTERN_MASK,
                .is_ad778x = false,
        },
        [ID_AD7171] = {
                .channel = AD7170_CHANNEL(16, 24),
-               .pattern = AD7170_PATTERN,
+               .pattern = AD7170_PATTERN_GOOD,
                .pattern_mask = AD7170_PATTERN_MASK,
                .is_ad778x = false,
        },
        [ID_AD7780] = {
                .channel = AD7780_CHANNEL(24, 32),
-               .pattern = AD7780_PATTERN,
+               .pattern = AD7780_PATTERN_GOOD,
                .pattern_mask = AD7780_PATTERN_MASK,
                .is_ad778x = true,
        },
        [ID_AD7781] = {
                .channel = AD7780_CHANNEL(20, 32),
-               .pattern = AD7780_PATTERN,
+               .pattern = AD7780_PATTERN_GOOD,
                .pattern_mask = AD7780_PATTERN_MASK,
                .is_ad778x = true,

        },

--
2.21.0

The ad7780 supports both the ad778x and ad717x families. Each chip has a corresponding ID. This patch provides a mask for extracting ID values from the status bits and also macros for the correct values for the ad7170, ad7171, ad7780 and ad7781.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -0

index 56c49e28f432..ad7617a3a141 100644
@@ -26,10 +26,14 @@
 #define AD7780_RDY             BIT(7)
 #define AD7780_FILTER          BIT(6)
 #define AD7780_ERR             BIT(5)

drivers/staging/iio/adc/ad7780.c +0 -1

 #define AD7780_PATTERN_GOOD    1
 #define AD7780_PATTERN_MASK    GENMASK(1, 0)
--

2.21.0

Quoted 25 lines · Renato Lui Geh

The ad7780 supports both the ad778x and ad717x families. Each chip has a corresponding ID. This patch provides a mask for extracting ID values from the status bits and also macros for the correct values for the ad7170, ad7171, ad7780 and ad7781.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -2

index 56c49e28f432..ad7617a3a141 100644
@@ -26,10 +26,14 @@
 #define AD7780_RDY             BIT(7)
 #define AD7780_FILTER          BIT(6)
 #define AD7780_ERR             BIT(5)
-#define AD7780_ID1             BIT(4)
-#define AD7780_ID0             BIT(3)
 #define AD7780_GAIN            BIT(2)
 

drivers/staging/iio/adc/ad7780.c line 36

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +6 -0

+#define AD7170_ID              0
+#define AD7171_ID              1
+#define AD7780_ID              1
+#define AD7781_ID              0
+
+#define AD7780_ID_MASK         (BIT(3) | BIT(4))

This also doesn't have any functionality change.
The AD7170_ID, AD7171_ID, AD7780_ID & AD7781_ID IDs are also unused (maybe in a later patch they are ?).

I would also leave the AD7780_ID1 & AD7780_ID0 definitions in place, since they're easier matched with the datasheet.

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +0 -1

 #define AD7780_PATTERN_GOOD    1
 #define AD7780_PATTERN_MASK    GENMASK(1, 0)
--

2.21.0

Quoted 26 lines · Alexandru

Quoted 25 lines · Renato Lui Geh

The ad7780 supports both the ad778x and ad717x families. Each chip has a corresponding ID. This patch provides a mask for extracting ID values from the status bits and also macros for the correct values for the ad7170, ad7171, ad7780 and ad7781.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -2

index 56c49e28f432..ad7617a3a141 100644
@@ -26,10 +26,14 @@
 #define AD7780_RDY             BIT(7)
 #define AD7780_FILTER          BIT(6)
 #define AD7780_ERR             BIT(5)
-#define AD7780_ID1             BIT(4)
-#define AD7780_ID0             BIT(3)
 #define AD7780_GAIN            BIT(2)
 

Quoted 10 lines

drivers/staging/iio/adc/ad7780.c line 36

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +6 -0

+#define AD7170_ID              0
+#define AD7171_ID              1
+#define AD7780_ID              1
+#define AD7781_ID              0
+
+#define AD7780_ID_MASK         (BIT(3) | BIT(4))  

This also doesn't have any functionality change.
The AD7170_ID, AD7171_ID, AD7780_ID & AD7781_ID IDs are also unused (maybe in a later patch they are ?).

They aren't. I added them following a previous review suggestion. Should I remove them?

Quoted 10 lines

I would also leave the AD7780_ID1 & AD7780_ID0 definitions in place, since they're easier matched with the datasheet.

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +0 -1

 #define AD7780_PATTERN_GOOD    1
 #define AD7780_PATTERN_MASK    GENMASK(1, 0)
--

2.21.0

[External]

Quoted 41 lines · On Sun, 3 Mar 2019 11:01:09 -0300 Renato Lui Geh <[email protected]> wrote:

Quoted 28 lines · Alexandru

Quoted 27 lines · Renato Lui Geh

The ad7780 supports both the ad778x and ad717x families. Each chip has
a corresponding ID. This patch provides a mask for extracting ID values
from the status bits and also macros for the correct values for the ad7170, ad7171, ad7780 and ad7781.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -2

index 56c49e28f432..ad7617a3a141 100644
@@ -26,10 +26,14 @@
 #define AD7780_RDY             BIT(7)
 #define AD7780_FILTER          BIT(6)
 #define AD7780_ERR             BIT(5)
-#define AD7780_ID1             BIT(4)
-#define AD7780_ID0             BIT(3)
 #define AD7780_GAIN            BIT(2)
 

Quoted 11 lines

drivers/staging/iio/adc/ad7780.c line 36

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +6 -0

+#define AD7170_ID              0
+#define AD7171_ID              1
+#define AD7780_ID              1
+#define AD7781_ID              0
+
+#define AD7780_ID_MASK         (BIT(3) | BIT(4))

This also doesn't have any functionality change.
The AD7170_ID, AD7171_ID, AD7780_ID & AD7781_ID IDs are also unused (maybe
in a later patch they are ?).

Quoted 3 lines

They aren't. I added them following a previous review suggestion. Should
I remove them?

Can we check them? It's always useful to confirm that the device is the one you think it is. Then we can either use what is there with a suitable warning, or if that is tricky just fault out as the dt is giving us the wrong part number.

J

Quoted 12 lines

Quoted 12 lines

I would also leave the AD7780_ID1 & AD7780_ID0 definitions in place, since
they're easier matched with the datasheet.

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +0 -1

 #define AD7780_PATTERN_GOOD    1
 #define AD7780_PATTERN_MASK    GENMASK(1, 0)
--

2.21.0

Quoted 51 lines · Jonathan Cameron

[External]

Quoted 41 lines · On Sun, 3 Mar 2019 11:01:09 -0300 Renato Lui Geh <[email protected]> wrote:

Quoted 28 lines · Alexandru

Quoted 27 lines · Renato Lui Geh

The ad7780 supports both the ad778x and ad717x families. Each chip has
a corresponding ID. This patch provides a mask for extracting ID values
from the status bits and also macros for the correct values for the ad7170, ad7171, ad7780 and ad7781.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -2

index 56c49e28f432..ad7617a3a141 100644
@@ -26,10 +26,14 @@
 #define AD7780_RDY             BIT(7)
 #define AD7780_FILTER          BIT(6)
 #define AD7780_ERR             BIT(5)
-#define AD7780_ID1             BIT(4)
-#define AD7780_ID0             BIT(3)
 #define AD7780_GAIN            BIT(2)
 

Quoted 11 lines

drivers/staging/iio/adc/ad7780.c line 36

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +6 -0

+#define AD7170_ID              0
+#define AD7171_ID              1
+#define AD7780_ID              1
+#define AD7781_ID              0
+
+#define AD7780_ID_MASK         (BIT(3) | BIT(4))

This also doesn't have any functionality change.
The AD7170_ID, AD7171_ID, AD7780_ID & AD7781_ID IDs are also unused (maybe
in a later patch they are ?).

Quoted 3 lines

They aren't. I added them following a previous review suggestion. Should
I remove them?

Quoted 6 lines

Can we check them? It's always useful to confirm that the device is the one you think it is. Then we can either use what is there with a suitable warning, or if that is tricky just fault out as the dt is giving us the wrong part number.

J

I guess dev_warn_ratelimited() could be used to make sure syslog isn't spammed-to-death when doing multiple conversions, and the ID isn't correct. Since these IDs are read after you get a sample, I'm a bit fearful of log- spam.

I wouldn't throw an error in the ad7780_postprocess_sample() for this, but warning [with rate-limit] sounds reasonable.

Quoted 15 lines

Quoted 13 lines

Quoted 13 lines

I would also leave the AD7780_ID1 & AD7780_ID0 definitions in place, since
they're easier matched with the datasheet.

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +0 -1

 #define AD7780_PATTERN_GOOD    1
 #define AD7780_PATTERN_MASK    GENMASK(1, 0)
--

2.21.0

Quoted 64 lines · Alexandru

Quoted 51 lines · Jonathan Cameron

[External]

Quoted 41 lines · On Sun, 3 Mar 2019 11:01:09 -0300 Renato Lui Geh <[email protected]> wrote:

Quoted 28 lines · Alexandru

Quoted 27 lines · Renato Lui Geh

The ad7780 supports both the ad778x and ad717x families. Each chip has
a corresponding ID. This patch provides a mask for extracting ID values
from the status bits and also macros for the correct values for the ad7170, ad7171, ad7780 and ad7781.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -2

index 56c49e28f432..ad7617a3a141 100644
@@ -26,10 +26,14 @@
 #define AD7780_RDY             BIT(7)
 #define AD7780_FILTER          BIT(6)
 #define AD7780_ERR             BIT(5)
-#define AD7780_ID1             BIT(4)
-#define AD7780_ID0             BIT(3)
 #define AD7780_GAIN            BIT(2)
 

Quoted 11 lines

drivers/staging/iio/adc/ad7780.c line 36

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +6 -0

+#define AD7170_ID              0
+#define AD7171_ID              1
+#define AD7780_ID              1
+#define AD7781_ID              0
+
+#define AD7780_ID_MASK         (BIT(3) | BIT(4))  

This also doesn't have any functionality change.
The AD7170_ID, AD7171_ID, AD7780_ID & AD7781_ID IDs are also unused (maybe
in a later patch they are ?).

Quoted 3 lines

They aren't. I added them following a previous review suggestion. Should
I remove them?

Quoted 6 lines

Can we check them? It's always useful to confirm that the device is the one you think it is. Then we can either use what is there with a suitable warning, or if that is tricky just fault out as the dt is giving us the wrong part number.

J

I guess dev_warn_ratelimited() could be used to make sure syslog isn't spammed-to-death when doing multiple conversions, and the ID isn't correct. Since these IDs are read after you get a sample, I'm a bit fearful of log- spam.

Quoted 2 lines

I wouldn't throw an error in the ad7780_postprocess_sample() for this, but warning [with rate-limit] sounds reasonable.

Looking at dev_warn_ratelimited's definition (and its use in other parts of the kernel), I see that we'd need the device to be stored somewhere (perhaps in ad7780_state?) in order for us to pass it as argument to dev_warn from within postprocess_sample. Should this be stored in ad7780_state? Or can I get the spi_device some other way?

Quoted 15 lines

Quoted 15 lines

Quoted 13 lines

Quoted 13 lines

I would also leave the AD7780_ID1 & AD7780_ID0 definitions in place, since
they're easier matched with the datasheet.

Quoted 6 lines

drivers/staging/iio/adc/ad7780.c +0 -1

 #define AD7780_PATTERN_GOOD    1
 #define AD7780_PATTERN_MASK    GENMASK(1, 0)
--

2.21.0

To maintain consistency between ad7780_probe and ad7780_remove orders, regulator initialization has been moved to after GPIO initializations.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -10

index ad7617a3a141..12aef0f101bc 100644
@@ -255,16 +255,6 @@ static int ad7780_probe(struct spi_device *spi)
 
        ad_sd_init(&st->sd, indio_dev, spi, &ad7780_sigma_delta_info);
 
-       st->reg = devm_regulator_get(&spi->dev, "avdd");
-       if (IS_ERR(st->reg))
-               return PTR_ERR(st->reg);
-
-       ret = regulator_enable(st->reg);
-       if (ret) {
-               dev_err(&spi->dev, "Failed to enable specified AVdd
 supply\n");
-               return ret;
-       }
-
        st->chip_info =
                &ad7780_chip_info_tbl[spi_get_device_id(spi)-

Quoted 1 line

driver_data];

drivers/staging/iio/adc/ad7780.c +1 -1

@@ -284,7 +274,7 @@ static int ad7780_probe(struct spi_device *spi)
                ret = PTR_ERR(st->powerdown_gpio);
                dev_err(&spi->dev, "Failed to request powerdown GPIO:
 %d\n",
                        ret);
-               goto error_disable_reg;
+               return ret;
        }
 

        if (st->chip_info->is_ad778x) {

drivers/staging/iio/adc/ad7780.c +1 -1

@@ -295,7 +285,7 @@ static int ad7780_probe(struct spi_device *spi)
                        ret = PTR_ERR(st->gain_gpio);
                        dev_err(&spi->dev, "Failed to request gain GPIO:
 %d\n",
                                ret);
-                       goto error_disable_reg;
+                       return ret;
                }
 

                st->filter_gpio = devm_gpiod_get_optional(&spi->dev,

drivers/staging/iio/adc/ad7780.c +2 -1

@@ -306,10 +296,20 @@ static int ad7780_probe(struct spi_device *spi)
                        dev_err(&spi->dev,
                                "Failed to request filter GPIO: %d\n",
                                ret);
-                       goto error_disable_reg;
+                       return ret;
                }
        }
 
+       st->reg = devm_regulator_get(&spi->dev, "avdd");

drivers/staging/iio/adc/ad7780.c +0 -0

        ret = ad_sd_setup_buffer_and_trigger(indio_dev);
        if (ret)

                goto error_disable_reg;

--
2.21.0

Quoted 63 lines · Renato Lui Geh

To maintain consistency between ad7780_probe and ad7780_remove orders, regulator initialization has been moved to after GPIO initializations.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -10

index ad7617a3a141..12aef0f101bc 100644
@@ -255,16 +255,6 @@ static int ad7780_probe(struct spi_device *spi)
 
        ad_sd_init(&st->sd, indio_dev, spi, &ad7780_sigma_delta_info);
 
-       st->reg = devm_regulator_get(&spi->dev, "avdd");
-       if (IS_ERR(st->reg))
-               return PTR_ERR(st->reg);
-
-       ret = regulator_enable(st->reg);
-       if (ret) {
-               dev_err(&spi->dev, "Failed to enable specified AVdd
 supply\n");
-               return ret;
-       }
-
        st->chip_info =
                &ad7780_chip_info_tbl[spi_get_device_id(spi)-  

Quoted 1 line

driver_data];

drivers/staging/iio/adc/ad7780.c +1 -1

@@ -284,7 +274,7 @@ static int ad7780_probe(struct spi_device *spi)
                ret = PTR_ERR(st->powerdown_gpio);
                dev_err(&spi->dev, "Failed to request powerdown GPIO:
 %d\n",
                        ret);
-               goto error_disable_reg;
+               return ret;
        }
 

        if (st->chip_info->is_ad778x) {

drivers/staging/iio/adc/ad7780.c +1 -1

@@ -295,7 +285,7 @@ static int ad7780_probe(struct spi_device *spi)
                        ret = PTR_ERR(st->gain_gpio);
                        dev_err(&spi->dev, "Failed to request gain GPIO:
 %d\n",
                                ret);
-                       goto error_disable_reg;
+                       return ret;
                }
 

                st->filter_gpio = devm_gpiod_get_optional(&spi->dev,

drivers/staging/iio/adc/ad7780.c +1 -1

@@ -306,10 +296,20 @@ static int ad7780_probe(struct spi_device *spi)
                        dev_err(&spi->dev,
                                "Failed to request filter GPIO: %d\n",
                                ret);
-                       goto error_disable_reg;
+                       return ret;
                }
        }
 

drivers/staging/iio/adc/ad7780.c static int ad7780_probe(struct spi_device *spi) · line 313

Quoted 11 lines

drivers/staging/iio/adc/ad7780.c +10 -0

+       st->reg = devm_regulator_get(&spi->dev, "avdd");
+       if (IS_ERR(st->reg))
+               return PTR_ERR(st->reg);
+
+       ret = regulator_enable(st->reg);
+       if (ret) {
+               dev_err(&spi->dev, "Failed to enable specified AVdd
 supply\n");
+               return ret;
+       }
+  

I'm probably missing something, but other than the fact that this moves the regulator init after the GPIOs init, it doesn't change much. The order of the probe & remove is more-or-less the same.
The GPIOs will be free'd via devm_ API/stuff.

Quoted 8 lines

drivers/staging/iio/adc/ad7780.c +0 -0

        ret = ad_sd_setup_buffer_and_trigger(indio_dev);
        if (ret)

                goto error_disable_reg;

--
2.21.0

[External]

Quoted 78 lines · Alexandru

Quoted 77 lines · Renato Lui Geh

To maintain consistency between ad7780_probe and ad7780_remove orders,
regulator initialization has been moved to after GPIO initializations.

Signed-off-by Renato Lui Geh <[email protected]>

---
 drivers/staging/iio/adc/ad7780.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

drivers/staging/iio/adc/ad7780.c +0 -10

index ad7617a3a141..12aef0f101bc 100644
@@ -255,16 +255,6 @@ static int ad7780_probe(struct spi_device *spi)
 
        ad_sd_init(&st->sd, indio_dev, spi,
 &ad7780_sigma_delta_info);
 
-       st->reg = devm_regulator_get(&spi->dev, "avdd");
-       if (IS_ERR(st->reg))
-               return PTR_ERR(st->reg);
-
-       ret = regulator_enable(st->reg);
-       if (ret) {
-               dev_err(&spi->dev, "Failed to enable specified AVdd
 supply\n");
-               return ret;
-       }
-
        st->chip_info =

                &ad7780_chip_info_tbl[spi_get_device_id(spi)-

Quoted 1 line

driver_data];

drivers/staging/iio/adc/ad7780.c +1 -1

@@ -284,7 +274,7 @@ static int ad7780_probe(struct spi_device *spi)
                ret = PTR_ERR(st->powerdown_gpio);
                dev_err(&spi->dev, "Failed to request powerdown GPIO:
 %d\n",
                        ret);
-               goto error_disable_reg;
+               return ret;
        }
 

        if (st->chip_info->is_ad778x) {

drivers/staging/iio/adc/ad7780.c +0 -0

@@ -295,7 +285,7 @@ static int ad7780_probe(struct spi_device *spi)
                        ret = PTR_ERR(st->gain_gpio);
                        dev_err(&spi->dev, "Failed to request gain

GPIO:
%d\n",

                                ret);

drivers/staging/iio/adc/ad7780.c +10 -2

-                       goto error_disable_reg;
+                       return ret;
                }
 
                st->filter_gpio = devm_gpiod_get_optional(&spi->dev,

@@ -306,10 +296,20 @@ static int ad7780_probe(struct spi_device *spi)
                        dev_err(&spi->dev,
                                "Failed to request filter GPIO:
 %d\n",
                                ret);
-                       goto error_disable_reg;
+                       return ret;
                }
        }
 
+       st->reg = devm_regulator_get(&spi->dev, "avdd");
+       if (IS_ERR(st->reg))
+               return PTR_ERR(st->reg);
+
+       ret = regulator_enable(st->reg);
+       if (ret) {
+               dev_err(&spi->dev, "Failed to enable specified AVdd
 supply\n");
+               return ret;

Quoted 8 lines

drivers/staging/iio/adc/ad7780.c static int ad7780_probe(struct spi_device *spi) · line 314

Quoted 2 lines

drivers/staging/iio/adc/ad7780.c +2 -0

+       }
+

I'm probably missing something, but other than the fact that this moves the
regulator init after the GPIOs init, it doesn't change much. The order of the probe & remove is more-or-less the same. The GPIOs will be free'd via devm_ API/stuff.

This is another one from me. I'm a fanatic at times when it comes to probe and remove orders being precise reverses. It just makes review easier. Nice to not actually have to think.

So I agree there is no 'actual' effect but it is in my view still worth doing.

Jonathan

Quoted 8 lines

Quoted 8 lines

drivers/staging/iio/adc/ad7780.c +0 -0

        ret = ad_sd_setup_buffer_and_trigger(indio_dev);

        if (ret)
                goto error_disable_reg;

--
2.21.0

Move ad7780 ADC driver out of staging and into the mainline.

The ad7780 is a sigma-delta analog to digital converter. This driver provides reading voltage values and status bits from both the ad778x and ad717x series. Its interface also allows writing on the FILTER and GAIN GPIO pins on the ad778x.

Signed-off-by Renato Lui Geh <[email protected]>

Signed-off-by Giuliano Belinassi <[email protected]>

Co-developed-by Giuliano Belinassi <[email protected]>

---
Changes in v3:
- Changes unrelated to moving the driver to main tree were resent as individual patches
Changes in v4:
- Removed line warning it was safe to build the ad7780 driver by default

About the above change in v4, I was unsure whether it was ok to add this in this patch, as 'move out of staging' patches should be just that. But this change is so minimal I'm willing to risk a v5. Bottom line: should I add this change as another patch?

 drivers/iio/adc/Kconfig          |  12 +
 drivers/iio/adc/Makefile         |   1 +
 drivers/iio/adc/ad7780.c         | 365 +++++++++++++++++++++++++++++++
 drivers/staging/iio/adc/Kconfig  |  13 --
 drivers/staging/iio/adc/Makefile |   1 -
 drivers/staging/iio/adc/ad7780.c | 365 -------------------------------
 6 files changed, 378 insertions(+), 379 deletions(-)
 create mode 100644 drivers/iio/adc/ad7780.c
 delete mode 100644 drivers/staging/iio/adc/ad7780.c

drivers/iio/adc/Kconfig +12 -0

index f3cc7a31bce5..6b36a45bd09f 100644
@@ -108,6 +108,18 @@ config AD7766
 	  To compile this driver as a module, choose M here: the module will be
 	  called ad7766.
 
+config AD7780
+	tristate "Analog Devices AD7780 and similar ADCs driver"
+	depends on SPI
+	depends on GPIOLIB || COMPILE_TEST
+	select AD_SIGMA_DELTA
+	help
+	  Say yes here to build support for Analog Devices AD7170, AD7171,
+	  AD7780 and AD7781 SPI analog to digital converters (ADC).
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called ad7780.
+
 config AD7791
 	tristate "Analog Devices AD7791 ADC driver"
 	depends on SPI

drivers/iio/adc/Makefile +1 -0

index ea5031348052..b48852157115 100644
@@ -15,6 +15,7 @@ obj-$(CONFIG_AD7606_IFACE_PARALLEL) += ad7606_par.o
 obj-$(CONFIG_AD7606_IFACE_SPI) += ad7606_spi.o
 obj-$(CONFIG_AD7606) += ad7606.o
 obj-$(CONFIG_AD7766) += ad7766.o
+obj-$(CONFIG_AD7780) += ad7780.o
 obj-$(CONFIG_AD7791) += ad7791.o
 obj-$(CONFIG_AD7793) += ad7793.o
 obj-$(CONFIG_AD7887) += ad7887.o

drivers/iio/adc/ad7780.c new file +365 -0

new file mode 100644
index 000000000000..aa1ddd0c45ee
@@ -0,0 +1,365 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * AD7170/AD7171 and AD7780/AD7781 SPI ADC driver
+ *
+ * Copyright 2011 Analog Devices Inc.
+ * Copyright 2019 Renato Lui Geh
+ */
+
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/spi/spi.h>
+#include <linux/regulator/consumer.h>
+#include <linux/err.h>
+#include <linux/sched.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/bits.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/adc/ad_sigma_delta.h>
+
+#define AD7780_RDY		BIT(7)
+#define AD7780_FILTER		BIT(6)
+#define AD7780_ERR		BIT(5)
+#define AD7780_GAIN		BIT(2)
+
+#define AD7170_ID		0
+#define AD7171_ID		1
+#define AD7780_ID		1
+#define AD7781_ID		0
+
+#define AD7780_ID_MASK		(BIT(3) | BIT(4))
+
+#define AD7780_PATTERN_GOOD	1
+#define AD7780_PATTERN_MASK	GENMASK(1, 0)
+
+#define AD7170_PATTERN_GOOD	5
+#define AD7170_PATTERN_MASK	GENMASK(2, 0)
+
+#define AD7780_GAIN_MIDPOINT	64
+#define AD7780_FILTER_MIDPOINT	13350
+
+static const unsigned int ad778x_gain[2]      = { 1, 128 };
+static const unsigned int ad778x_odr_avail[2] = { 10000, 16700 };
+
+struct ad7780_chip_info {
+	struct iio_chan_spec	channel;
+	unsigned int		pattern_mask;
+	unsigned int		pattern;
+	bool			is_ad778x;
+};
+
+struct ad7780_state {
+	const struct ad7780_chip_info	*chip_info;
+	struct regulator		*reg;
+	struct gpio_desc		*powerdown_gpio;
+	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;
+};
+
+enum ad7780_supported_device_ids {
+	ID_AD7170,
+	ID_AD7171,
+	ID_AD7780,
+	ID_AD7781,
+};
+
+static struct ad7780_state *ad_sigma_delta_to_ad7780(struct ad_sigma_delta *sd)
+{
+	return container_of(sd, struct ad7780_state, sd);
+}
+
+static int ad7780_set_mode(struct ad_sigma_delta *sigma_delta,
+			   enum ad_sigma_delta_mode mode)
+{
+	struct ad7780_state *st = ad_sigma_delta_to_ad7780(sigma_delta);
+	unsigned int val;
+
+	switch (mode) {
+	case AD_SD_MODE_SINGLE:
+	case AD_SD_MODE_CONTINUOUS:
+		val = 1;
+		break;
+	default:
+		val = 0;
+		break;
+	}
+
+	gpiod_set_value(st->powerdown_gpio, val);
+
+	return 0;
+}
+
+static int ad7780_read_raw(struct iio_dev *indio_dev,
+			   struct iio_chan_spec const *chan,
+			   int *val,
+			   int *val2,
+			   long m)
+{
+	struct ad7780_state *st = iio_priv(indio_dev);
+	int voltage_uv;
+
+	switch (m) {
+	case IIO_CHAN_INFO_RAW:
+		return ad_sigma_delta_single_conversion(indio_dev, chan, val);
+	case IIO_CHAN_INFO_SCALE:
+		voltage_uv = regulator_get_voltage(st->reg);
+		if (voltage_uv < 0)
+			return voltage_uv;
+		voltage_uv /= 1000;
+		*val = voltage_uv * st->gain;
+		*val2 = chan->scan_type.realbits - 1;
+		st->int_vref_mv = voltage_uv;
+		return IIO_VAL_FRACTIONAL_LOG2;
+	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;
+	}
+
+	return -EINVAL;
+}
+
+static int ad7780_write_raw(struct iio_dev *indio_dev,
+			    struct iio_chan_spec const *chan,
+			    int val,
+			    int val2,
+			    long m)
+{
+	struct ad7780_state *st = iio_priv(indio_dev);
+	const struct ad7780_chip_info *chip_info = st->chip_info;
+	unsigned long long vref;
+	unsigned int full_scale, gain;
+
+	if (!chip_info->is_ad778x)
+		return 0;
+
+	switch (m) {
+	case IIO_CHAN_INFO_SCALE:
+		if (val != 0)
+			return -EINVAL;
+
+		vref = st->int_vref_mv * 1000000LL;
+		full_scale = 1 << (chip_info->channel.scan_type.realbits - 1);
+		gain = DIV_ROUND_CLOSEST(vref, full_scale);
+		gain = DIV_ROUND_CLOSEST(gain, val2);
+		st->gain = gain;
+		if (gain < AD7780_GAIN_MIDPOINT)
+			gain = 0;
+		else
+			gain = 1;
+		gpiod_set_value(st->gain_gpio, gain);
+		break;
+	case IIO_CHAN_INFO_SAMP_FREQ:
+		if (1000*val + val2/1000 < AD7780_FILTER_MIDPOINT)
+			val = 0;
+		else
+			val = 1;
+		st->odr = ad778x_odr_avail[val];
+		gpiod_set_value(st->filter_gpio, val);
+		break;
+	default:
+	break;
+	}
+
+	return 0;
+}
+
+static int ad7780_postprocess_sample(struct ad_sigma_delta *sigma_delta,
+				     unsigned int raw_sample)
+{
+	struct ad7780_state *st = ad_sigma_delta_to_ad7780(sigma_delta);
+	const struct ad7780_chip_info *chip_info = st->chip_info;
+
+	if ((raw_sample & AD7780_ERR) ||
+	    ((raw_sample & chip_info->pattern_mask) != chip_info->pattern))
+		return -EIO;
+
+	if (chip_info->is_ad778x) {
+		st->gain = ad778x_gain[raw_sample & AD7780_GAIN];
+		st->odr = ad778x_odr_avail[raw_sample & AD7780_FILTER];
+	}
+
+	return 0;
+}
+
+static const struct ad_sigma_delta_info ad7780_sigma_delta_info = {
+	.set_mode = ad7780_set_mode,
+	.postprocess_sample = ad7780_postprocess_sample,
+	.has_registers = false,
+};
+
+#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 = AD7170_CHANNEL(12, 24),
+		.pattern = AD7170_PATTERN_GOOD,
+		.pattern_mask = AD7170_PATTERN_MASK,
+		.is_ad778x = false,
+	},
+	[ID_AD7171] = {
+		.channel = AD7170_CHANNEL(16, 24),
+		.pattern = AD7170_PATTERN_GOOD,
+		.pattern_mask = AD7170_PATTERN_MASK,
+		.is_ad778x = false,
+	},
+	[ID_AD7780] = {
+		.channel = AD7780_CHANNEL(24, 32),
+		.pattern = AD7780_PATTERN_GOOD,
+		.pattern_mask = AD7780_PATTERN_MASK,
+		.is_ad778x = true,
+	},
+	[ID_AD7781] = {
+		.channel = AD7780_CHANNEL(20, 32),
+		.pattern = AD7780_PATTERN_GOOD,
+		.pattern_mask = AD7780_PATTERN_MASK,
+		.is_ad778x = true,
+	},
+};
+
+static const struct iio_info ad7780_info = {
+	.read_raw = ad7780_read_raw,
+	.write_raw = ad7780_write_raw,
+};
+
+static int ad7780_probe(struct spi_device *spi)
+{
+	struct ad7780_state *st;
+	struct iio_dev *indio_dev;
+	int ret;
+
+	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+	if (!indio_dev)
+		return -ENOMEM;
+
+	st = iio_priv(indio_dev);
+	st->gain = 1;
+
+	ad_sd_init(&st->sd, indio_dev, spi, &ad7780_sigma_delta_info);
+
+	st->chip_info =
+		&ad7780_chip_info_tbl[spi_get_device_id(spi)->driver_data];
+
+	spi_set_drvdata(spi, indio_dev);
+
+	indio_dev->dev.parent = &spi->dev;
+	indio_dev->name = spi_get_device_id(spi)->name;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	indio_dev->channels = &st->chip_info->channel;
+	indio_dev->num_channels = 1;
+	indio_dev->info = &ad7780_info;
+
+	st->powerdown_gpio = devm_gpiod_get_optional(&spi->dev,
+						     "powerdown",
+						     GPIOD_OUT_LOW);
+	if (IS_ERR(st->powerdown_gpio)) {
+		ret = PTR_ERR(st->powerdown_gpio);
+		dev_err(&spi->dev, "Failed to request powerdown GPIO: %d\n",
+			ret);
+		return ret;
+	}
+
+	if (st->chip_info->is_ad778x) {
+		st->gain_gpio = devm_gpiod_get_optional(&spi->dev,
+							"adi,gain",
+							GPIOD_OUT_HIGH);
+		if (IS_ERR(st->gain_gpio)) {
+			ret = PTR_ERR(st->gain_gpio);
+			dev_err(&spi->dev, "Failed to request gain GPIO: %d\n",
+				ret);
+			return ret;
+		}
+
+		st->filter_gpio = devm_gpiod_get_optional(&spi->dev,
+							  "adi,filter",
+							  GPIOD_OUT_HIGH);
+		if (IS_ERR(st->filter_gpio)) {
+			ret = PTR_ERR(st->filter_gpio);
+			dev_err(&spi->dev,
+				"Failed to request filter GPIO: %d\n",
+				ret);
+			return ret;
+		}
+	}
+
+	st->reg = devm_regulator_get(&spi->dev, "avdd");
+	if (IS_ERR(st->reg))
+		return PTR_ERR(st->reg);
+
+	ret = regulator_enable(st->reg);
+	if (ret) {
+		dev_err(&spi->dev, "Failed to enable specified AVdd supply\n");
+		return ret;
+	}
+
+	ret = ad_sd_setup_buffer_and_trigger(indio_dev);
+	if (ret)
+		goto error_disable_reg;
+
+	ret = iio_device_register(indio_dev);
+	if (ret)
+		goto error_cleanup_buffer_and_trigger;
+
+	return 0;
+
+error_cleanup_buffer_and_trigger:
+	ad_sd_cleanup_buffer_and_trigger(indio_dev);
+error_disable_reg:
+	regulator_disable(st->reg);
+
+	return ret;
+}
+
+static int ad7780_remove(struct spi_device *spi)
+{
+	struct iio_dev *indio_dev = spi_get_drvdata(spi);
+	struct ad7780_state *st = iio_priv(indio_dev);
+
+	iio_device_unregister(indio_dev);
+	ad_sd_cleanup_buffer_and_trigger(indio_dev);
+
+	regulator_disable(st->reg);
+
+	return 0;
+}
+
+static const struct spi_device_id ad7780_id[] = {
+	{"ad7170", ID_AD7170},
+	{"ad7171", ID_AD7171},
+	{"ad7780", ID_AD7780},
+	{"ad7781", ID_AD7781},
+	{}
+};
+MODULE_DEVICE_TABLE(spi, ad7780_id);
+
+static struct spi_driver ad7780_driver = {
+	.driver = {
+		.name	= "ad7780",
+	},
+	.probe		= ad7780_probe,
+	.remove		= ad7780_remove,
+	.id_table	= ad7780_id,
+};
+module_spi_driver(ad7780_driver);
+
+MODULE_AUTHOR("Michael Hennerich <[email protected]>");
+MODULE_DESCRIPTION("Analog Devices AD7780 and similar ADCs");
+MODULE_LICENSE("GPL v2");

Adds a device tree binding for the ad7780 driver.

Signed-off-by Renato Lui Geh <[email protected]>

---
 .../bindings/iio/adc/adi,ad7780.txt           | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt

Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt new file +48 -0

new file mode 100644
index 000000000000..440e52555349
@@ -0,0 +1,48 @@
+* Analog Devices AD7170/AD7171/AD7780/AD7781
+
+Data sheets:
+
+- AD7170:
+	* https://www.analog.com/media/en/technical-documentation/data-sheets/AD7170.pdf
+- AD7171:
+	* https://www.analog.com/media/en/technical-documentation/data-sheets/AD7171.pdf
+- AD7780:
+	* https://www.analog.com/media/en/technical-documentation/data-sheets/ad7780.pdf
+- AD7781:
+	* https://www.analog.com/media/en/technical-documentation/data-sheets/AD7781.pdf
+
+Required properties:
+
+- compatible: should be one of
+	* "adi,ad7170"
+	* "adi,ad7171"
+	* "adi,ad7780"
+	* "adi,ad7781"
+- reg: spi chip select number for the device
+- vref-supply: the regulator supply for the ADC reference voltage
+
+Optional properties:
+
+- powerdown-gpios:  must be the device tree identifier of the PDRST pin. If
+		    specified, it will be asserted during driver probe. As the
+		    line is active high, it should be marked GPIO_ACTIVE_HIGH.
+- adi,gain-gpios:   must be the device tree identifier of the GAIN pin. Only for
+		    the ad778x chips. If specified, it will be asserted during
+		    driver probe. As the line is active low, it should be marked
+		    GPIO_ACTIVE_LOW.
+- adi,filter-gpios: must be the device tree identifier of the FILTER pin. Only
+		    for the ad778x chips. If specified, it will be asserted
+		    during driver probe. As the line is active low, it should be
+		    marked GPIO_ACTIVE_LOW.
+
+Example:
+
+adc@0 {
+	compatible =  "adi,ad7780";
+	reg =	      <0>;
+	vref-supply = <&vdd_supply>
+
+	powerdown-gpios  = <&gpio 12 GPIO_ACTIVE_HIGH>;
+	adi,gain-gpios   = <&gpio  5 GPIO_ACTIVE_LOW>;
+	adi,filter-gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+};

Adds a device tree binding for the ad7780 driver.

Signed-off-by Renato Lui Geh <[email protected]>

---
 .../bindings/iio/adc/adi,ad7780.txt           | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt

This series of patches contains the following:
- Adds user input for the 'gain' and 'filter' GPIO pins for the ad778x family chips;
- Filter reading for the ad778x;
- Sets pattern macro values and mask for PATTERN status bits;
- Adds ID values for the ad7170, ad7171, ad7780 and ad7781 for ID status bits checking;
- Moves regulator initialization to after GPIO init to maintain consistency between probe and remove;
- Copyright edits, adding SPDX identifier and new copyright holder;
- Moves the ad7780 driver out of staging to the mainline;
- Adds device tree binding for the ad7780 driver.

Renato Lui Geh (9):
staging: iio: ad7780: add gain & filter gpio support
staging: iio: ad7780: add filter reading to ad778x
staging: iio: ad7780: set pattern values and masks directly staging:iio:ad7780: add chip ID values and mask
staging: iio: ad7780: move regulator to after GPIO init
staging: iio: ad7780: add SPDX identifier
staging: iio: ad7780: add new copyright holder
staging: iio: ad7780: moving ad7780 out of staging
staging: iio: ad7780: add device tree binding

Changelog:
*v3
- SPDX and regulator init as patches
- Renamed filter to odr and ad778x_filter to ad778x_odr_avail
- Removed unnecessary regulator disabling
- Removed unnecessary AD_SD_CHANNEL macro
- Changed unsigned int to unsigned long long to avoid overflow
*v4
- Split gain & filter patch into two, with the new commit adding only filter reading
- Changed pattern values to direct values, and added pattern mask
- Added ID values and mask
- Added new copyright holder
- Added device tree binding to the ad7780 driver

 .../bindings/iio/adc/adi,ad7780.txt           |  48 +++
 drivers/iio/adc/Kconfig                       |  12 +
 drivers/iio/adc/Makefile                      |   1 +
 drivers/iio/adc/ad7780.c                      | 365 ++++++++++++++++++
 drivers/staging/iio/adc/Kconfig               |  13 -
 drivers/staging/iio/adc/Makefile              |   1 -
 drivers/staging/iio/adc/ad7780.c              | 277 -------------
 7 files changed, 426 insertions(+), 291 deletions(-)
 create mode 100644
Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt
 create mode 100644 drivers/iio/adc/ad7780.c
 delete mode 100644 drivers/staging/iio/adc/ad7780.c

--
2.21.0

Quoted 1 line · Renato Lui Geh

The patch-series is a bit big.
I guess that the intent is to move this out-of-staging, but various patches are holding this in it's place.
For patch series above a certain size, you could get many re-spins [V2,3,4... so on].

You could send some of the changes as individual patches, or group them in series of 1,2 or 3 patches. That way, you "parallelize" patch sending, and when you get reviews on each patch, you can re-spin them individually. You'll find over time that certain patches get accepted on V1, others on V2 and some on V7 [ hopefully, there isn't any frustration at that point ].

Well, this is a technique I use to distribute some of my upstream-patch- work, so that I can switch easier between internal-work & upstreaming-work.

Coming back to this patch-series.
My general input, is that the patches are fine over-all; some are just cosmetics/noise/a-different-way-of-doing-things-for-this-driver, and those usually can be left to preference [of the maintainer usually].

I do suggest to not hurry when re-spinning patches, and not change too much the number of patches in a new series. That can complicate things sometimes. But, if doing small patch-series or individual patches, you won't have this problem too much.

Thanks
Alex

Quoted 56 lines

This series of patches contains the following:
- Adds user input for the 'gain' and 'filter' GPIO pins for the ad778x family chips;
- Filter reading for the ad778x;
- Sets pattern macro values and mask for PATTERN status bits;
- Adds ID values for the ad7170, ad7171, ad7780 and ad7781 for ID status bits checking;
- Moves regulator initialization to after GPIO init to maintain consistency between probe and remove;
- Copyright edits, adding SPDX identifier and new copyright holder;
- Moves the ad7780 driver out of staging to the mainline;
- Adds device tree binding for the ad7780 driver.

Renato Lui Geh (9):
staging: iio: ad7780: add gain & filter gpio support
staging: iio: ad7780: add filter reading to ad778x
staging: iio: ad7780: set pattern values and masks directly staging:iio:ad7780: add chip ID values and mask
staging: iio: ad7780: move regulator to after GPIO init
staging: iio: ad7780: add SPDX identifier
staging: iio: ad7780: add new copyright holder
staging: iio: ad7780: moving ad7780 out of staging
staging: iio: ad7780: add device tree binding

Changelog:
*v3
- SPDX and regulator init as patches
- Renamed filter to odr and ad778x_filter to ad778x_odr_avail
- Removed unnecessary regulator disabling
- Removed unnecessary AD_SD_CHANNEL macro
- Changed unsigned int to unsigned long long to avoid overflow
*v4
- Split gain & filter patch into two, with the new commit adding only filter reading
- Changed pattern values to direct values, and added pattern mask
- Added ID values and mask
- Added new copyright holder
- Added device tree binding to the ad7780 driver

 .../bindings/iio/adc/adi,ad7780.txt           |  48 +++
 drivers/iio/adc/Kconfig                       |  12 +
 drivers/iio/adc/Makefile                      |   1 +
 drivers/iio/adc/ad7780.c                      | 365 ++++++++++++++++++
 drivers/staging/iio/adc/Kconfig               |  13 -
 drivers/staging/iio/adc/Makefile              |   1 -
 drivers/staging/iio/adc/ad7780.c              | 277 -------------
 7 files changed, 426 insertions(+), 291 deletions(-)
 create mode 100644
Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt
 create mode 100644 drivers/iio/adc/ad7780.c
 delete mode 100644 drivers/staging/iio/adc/ad7780.c

--
2.21.0

Signature · 5 lines

You received this message because you are subscribed to the Google Groups "Kernel USP" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/kernel-usp/72a54cd5f58aeb9507b95b7e33ca3d9a38c853e9.camel%40analog.com.
For more options, visit https://groups.google.com/d/optout.

Hi Alexandru,

Thanks for the review. Some questions inline.

Thanks,
Renato

Quoted 9 lines · Alexandru

Quoted 1 line · Renato Lui Geh

The patch-series is a bit big.
I guess that the intent is to move this out-of-staging, but various patches are holding this in it's place.
For patch series above a certain size, you could get many re-spins [V2,3,4... so on].

Quoted 5 lines

You could send some of the changes as individual patches, or group them in series of 1,2 or 3 patches. That way, you "parallelize" patch sending, and when you get reviews on each patch, you can re-spin them individually. You'll find over time that certain patches get accepted on V1, others on V2 and some on V7 [ hopefully, there isn't any frustration at that point ].

On these subseries, should versioning follow this patchset (v5) or should they start anew (v1), ignoring this series version?

Quoted 80 lines

Well, this is a technique I use to distribute some of my upstream-patch- work, so that I can switch easier between internal-work & upstreaming-work.

Coming back to this patch-series.
My general input, is that the patches are fine over-all; some are just cosmetics/noise/a-different-way-of-doing-things-for-this-driver, and those usually can be left to preference [of the maintainer usually].

I do suggest to not hurry when re-spinning patches, and not change too much the number of patches in a new series. That can complicate things sometimes. But, if doing small patch-series or individual patches, you won't have this problem too much.

Thanks
Alex

Quoted 53 lines

This series of patches contains the following:
- Adds user input for the 'gain' and 'filter' GPIO pins for the ad778x family chips;
- Filter reading for the ad778x;
- Sets pattern macro values and mask for PATTERN status bits;
- Adds ID values for the ad7170, ad7171, ad7780 and ad7781 for ID status bits checking;
- Moves regulator initialization to after GPIO init to maintain consistency between probe and remove;
- Copyright edits, adding SPDX identifier and new copyright holder;
- Moves the ad7780 driver out of staging to the mainline;
- Adds device tree binding for the ad7780 driver.

Renato Lui Geh (9):
staging: iio: ad7780: add gain & filter gpio support
staging: iio: ad7780: add filter reading to ad778x
staging: iio: ad7780: set pattern values and masks directly staging:iio:ad7780: add chip ID values and mask
staging: iio: ad7780: move regulator to after GPIO init
staging: iio: ad7780: add SPDX identifier
staging: iio: ad7780: add new copyright holder
staging: iio: ad7780: moving ad7780 out of staging
staging: iio: ad7780: add device tree binding

Changelog:
*v3
- SPDX and regulator init as patches
- Renamed filter to odr and ad778x_filter to ad778x_odr_avail
- Removed unnecessary regulator disabling
- Removed unnecessary AD_SD_CHANNEL macro
- Changed unsigned int to unsigned long long to avoid overflow
*v4
- Split gain & filter patch into two, with the new commit adding only filter reading
- Changed pattern values to direct values, and added pattern mask
- Added ID values and mask
- Added new copyright holder
- Added device tree binding to the ad7780 driver

 .../bindings/iio/adc/adi,ad7780.txt           |  48 +++
 drivers/iio/adc/Kconfig                       |  12 +
 drivers/iio/adc/Makefile                      |   1 +
 drivers/iio/adc/ad7780.c                      | 365 ++++++++++++++++++
 drivers/staging/iio/adc/Kconfig               |  13 -
 drivers/staging/iio/adc/Makefile              |   1 -
 drivers/staging/iio/adc/ad7780.c              | 277 -------------
 7 files changed, 426 insertions(+), 291 deletions(-)
 create mode 100644
Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt
 create mode 100644 drivers/iio/adc/ad7780.c
 delete mode 100644 drivers/staging/iio/adc/ad7780.c

Quoted 3 lines

--
2.21.0

--
You received this message because you are subscribed to the Google Groups "Kernel USP" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/kernel-usp/72a54cd5f58aeb9507b95b7e33ca3d9a38c853e9.camel%40analog.com.
For more options, visit https://groups.google.com/d/optout.