| Message ID | 1544705183-13288-8-git-send-email-stefan.popa@analog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: iio: ad7606: Move out of staging | expand |
On Thu, 13 Dec 2018 14:46:19 +0200 Stefan Popa <stefan.popa@analog.com> wrote: > The 'adi' vendor prefix needs to be added to conversion-start, range, > first-data and oversampling-ratio properties. > > Signed-off-by: Stefan Popa <stefan.popa@analog.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/staging/iio/adc/ad7606.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/iio/adc/ad7606.c b/drivers/staging/iio/adc/ad7606.c > index 0925379..3355301 100644 > --- a/drivers/staging/iio/adc/ad7606.c > +++ b/drivers/staging/iio/adc/ad7606.c > @@ -322,7 +322,7 @@ static int ad7606_request_gpios(struct ad7606_state *st) > { > struct device *dev = st->dev; > > - st->gpio_convst = devm_gpiod_get(dev, "conversion-start", > + st->gpio_convst = devm_gpiod_get(dev, "adi,conversion-start", > GPIOD_OUT_LOW); > if (IS_ERR(st->gpio_convst)) > return PTR_ERR(st->gpio_convst); > @@ -331,7 +331,8 @@ static int ad7606_request_gpios(struct ad7606_state *st) > if (IS_ERR(st->gpio_reset)) > return PTR_ERR(st->gpio_reset); > > - st->gpio_range = devm_gpiod_get_optional(dev, "range", GPIOD_OUT_LOW); > + st->gpio_range = devm_gpiod_get_optional(dev, "adi,range", > + GPIOD_OUT_LOW); > if (IS_ERR(st->gpio_range)) > return PTR_ERR(st->gpio_range); > > @@ -340,7 +341,7 @@ static int ad7606_request_gpios(struct ad7606_state *st) > if (IS_ERR(st->gpio_standby)) > return PTR_ERR(st->gpio_standby); > > - st->gpio_frstdata = devm_gpiod_get_optional(dev, "first-data", > + st->gpio_frstdata = devm_gpiod_get_optional(dev, "adi,first-data", > GPIOD_IN); > if (IS_ERR(st->gpio_frstdata)) > return PTR_ERR(st->gpio_frstdata); > @@ -348,7 +349,8 @@ static int ad7606_request_gpios(struct ad7606_state *st) > if (!st->chip_info->has_oversampling) > return 0; > > - st->gpio_os = devm_gpiod_get_array_optional(dev, "oversampling-ratio", > + st->gpio_os = devm_gpiod_get_array_optional(dev, > + "adi,oversampling-ratio", > GPIOD_OUT_LOW); > return PTR_ERR_OR_ZERO(st->gpio_os); > }
diff --git a/drivers/staging/iio/adc/ad7606.c b/drivers/staging/iio/adc/ad7606.c index 0925379..3355301 100644 --- a/drivers/staging/iio/adc/ad7606.c +++ b/drivers/staging/iio/adc/ad7606.c @@ -322,7 +322,7 @@ static int ad7606_request_gpios(struct ad7606_state *st) { struct device *dev = st->dev; - st->gpio_convst = devm_gpiod_get(dev, "conversion-start", + st->gpio_convst = devm_gpiod_get(dev, "adi,conversion-start", GPIOD_OUT_LOW); if (IS_ERR(st->gpio_convst)) return PTR_ERR(st->gpio_convst); @@ -331,7 +331,8 @@ static int ad7606_request_gpios(struct ad7606_state *st) if (IS_ERR(st->gpio_reset)) return PTR_ERR(st->gpio_reset); - st->gpio_range = devm_gpiod_get_optional(dev, "range", GPIOD_OUT_LOW); + st->gpio_range = devm_gpiod_get_optional(dev, "adi,range", + GPIOD_OUT_LOW); if (IS_ERR(st->gpio_range)) return PTR_ERR(st->gpio_range); @@ -340,7 +341,7 @@ static int ad7606_request_gpios(struct ad7606_state *st) if (IS_ERR(st->gpio_standby)) return PTR_ERR(st->gpio_standby); - st->gpio_frstdata = devm_gpiod_get_optional(dev, "first-data", + st->gpio_frstdata = devm_gpiod_get_optional(dev, "adi,first-data", GPIOD_IN); if (IS_ERR(st->gpio_frstdata)) return PTR_ERR(st->gpio_frstdata); @@ -348,7 +349,8 @@ static int ad7606_request_gpios(struct ad7606_state *st) if (!st->chip_info->has_oversampling) return 0; - st->gpio_os = devm_gpiod_get_array_optional(dev, "oversampling-ratio", + st->gpio_os = devm_gpiod_get_array_optional(dev, + "adi,oversampling-ratio", GPIOD_OUT_LOW); return PTR_ERR_OR_ZERO(st->gpio_os); }
The 'adi' vendor prefix needs to be added to conversion-start, range, first-data and oversampling-ratio properties. Signed-off-by: Stefan Popa <stefan.popa@analog.com> --- drivers/staging/iio/adc/ad7606.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)