From: David Veenstra <davidjulianveenstra@gmail.com> To: lars@metafoo.de, jic23@kernel.org, pmeerw@pmeerw.net Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, Michael.Hennerich@analog.com, linux-iio@vger.kernel.org, robh+dt@kernel.org, knaack.h@gmx.de, daniel.baluta@nxp.com Subject: [PATCH v2 08/13] staging: iio: ad2s1200: Replace legacy gpio API with modern API Date: Fri, 20 Apr 2018 21:30:44 +0200 [thread overview] Message-ID: <4253be22c7081a5032b59097bc166f559e7b1cea.1524247563.git.davidjulianveenstra@gmail.com> (raw) In-Reply-To: <cover.1524247563.git.davidjulianveenstra@gmail.com> The legacy, integer based gpio API is replaced with the descriptor based API. For compatibility, it is first tried to use the platform data to request the gpio's. Otherwise, it looks for the "sample" and "rdvel" gpio function. Signed-off-by: David Veenstra <davidjulianveenstra@gmail.com> --- drivers/staging/iio/resolver/ad2s1200.c | 51 ++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/staging/iio/resolver/ad2s1200.c index 11ed9c7332e6..29a9bb666e7b 100644 --- a/drivers/staging/iio/resolver/ad2s1200.c +++ b/drivers/staging/iio/resolver/ad2s1200.c @@ -14,6 +14,7 @@ #include <linux/delay.h> #include <linux/device.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/spi/spi.h> @@ -44,8 +45,8 @@ struct ad2s1200_state { struct mutex lock; struct spi_device *sdev; - int sample; - int rdvel; + struct gpio_desc *sample; + struct gpio_desc *rdvel; u8 rx[2] ____cacheline_aligned; }; @@ -60,12 +61,12 @@ static int ad2s1200_read_raw(struct iio_dev *indio_dev, u16 vel; mutex_lock(&st->lock); - gpio_set_value(st->sample, 0); + gpiod_set_value(st->sample, 0); /* delay (6 * AD2S1200_TSCLK + 20) nano seconds */ udelay(1); - gpio_set_value(st->sample, 1); - gpio_set_value(st->rdvel, !!(chan->type == IIO_ANGL)); + gpiod_set_value(st->sample, 1); + gpiod_set_value(st->rdvel, !!(chan->type == IIO_ANGL)); ret = spi_read(st->sdev, st->rx, 2); if (ret < 0) { @@ -121,13 +122,18 @@ static int ad2s1200_probe(struct spi_device *spi) dev = &spi->dev; - for (pn = 0; pn < AD2S1200_PN; pn++) { - ret = devm_gpio_request_one(dev, pins[pn], GPIOF_DIR_OUT, - DRV_NAME); - if (ret) { - dev_err(dev, "request gpio pin %d failed\n", - pins[pn]); - return ret; + if (pins) { + for (pn = 0; pn < AD2S1200_PN; pn++) { + ret = devm_gpio_request_one(dev, pins[pn], + GPIOF_DIR_OUT, + DRV_NAME); + if (ret) { + dev_err(dev, + "Failed to claim gpio %d\n: err=%d", + pins[pn], + ret); + return ret; + } } } @@ -139,8 +145,25 @@ static int ad2s1200_probe(struct spi_device *spi) st = iio_priv(indio_dev); mutex_init(&st->lock); st->sdev = spi; - st->sample = pins[0]; - st->rdvel = pins[1]; + + if (pins) { + st->sample = gpio_to_desc(pins[0]); + st->rdvel = gpio_to_desc(pins[1]); + } else { + st->sample = devm_gpiod_get(dev, "sample", GPIOD_OUT_LOW); + if (IS_ERR(st->sample)) { + dev_err(dev, "Failed to claim SAMPLE gpio: err=%ld\n", + PTR_ERR(st->sample)); + return PTR_ERR(st->sample); + } + + st->rdvel = devm_gpiod_get(dev, "rdvel", GPIOD_OUT_LOW); + if (IS_ERR(st->rdvel)) { + dev_err(dev, "Failed to claim RDVEL gpio: err=%ld\n", + PTR_ERR(st->rdvel)); + return PTR_ERR(st->rdvel); + } + } indio_dev->dev.parent = dev; indio_dev->info = &ad2s1200_info; -- 2.16.2
WARNING: multiple messages have this Message-ID (diff)
From: David Veenstra <davidjulianveenstra@gmail.com> To: lars@metafoo.de, jic23@kernel.org, pmeerw@pmeerw.net Cc: robh+dt@kernel.org, Michael.Hennerich@analog.com, knaack.h@gmx.de, daniel.baluta@nxp.com, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, devicetree@vger.kernel.org Subject: [PATCH v2 08/13] staging: iio: ad2s1200: Replace legacy gpio API with modern API Date: Fri, 20 Apr 2018 21:30:44 +0200 [thread overview] Message-ID: <4253be22c7081a5032b59097bc166f559e7b1cea.1524247563.git.davidjulianveenstra@gmail.com> (raw) In-Reply-To: <cover.1524247563.git.davidjulianveenstra@gmail.com> The legacy, integer based gpio API is replaced with the descriptor based API. For compatibility, it is first tried to use the platform data to request the gpio's. Otherwise, it looks for the "sample" and "rdvel" gpio function. Signed-off-by: David Veenstra <davidjulianveenstra@gmail.com> --- drivers/staging/iio/resolver/ad2s1200.c | 51 ++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/staging/iio/resolver/ad2s1200.c index 11ed9c7332e6..29a9bb666e7b 100644 --- a/drivers/staging/iio/resolver/ad2s1200.c +++ b/drivers/staging/iio/resolver/ad2s1200.c @@ -14,6 +14,7 @@ #include <linux/delay.h> #include <linux/device.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/spi/spi.h> @@ -44,8 +45,8 @@ struct ad2s1200_state { struct mutex lock; struct spi_device *sdev; - int sample; - int rdvel; + struct gpio_desc *sample; + struct gpio_desc *rdvel; u8 rx[2] ____cacheline_aligned; }; @@ -60,12 +61,12 @@ static int ad2s1200_read_raw(struct iio_dev *indio_dev, u16 vel; mutex_lock(&st->lock); - gpio_set_value(st->sample, 0); + gpiod_set_value(st->sample, 0); /* delay (6 * AD2S1200_TSCLK + 20) nano seconds */ udelay(1); - gpio_set_value(st->sample, 1); - gpio_set_value(st->rdvel, !!(chan->type == IIO_ANGL)); + gpiod_set_value(st->sample, 1); + gpiod_set_value(st->rdvel, !!(chan->type == IIO_ANGL)); ret = spi_read(st->sdev, st->rx, 2); if (ret < 0) { @@ -121,13 +122,18 @@ static int ad2s1200_probe(struct spi_device *spi) dev = &spi->dev; - for (pn = 0; pn < AD2S1200_PN; pn++) { - ret = devm_gpio_request_one(dev, pins[pn], GPIOF_DIR_OUT, - DRV_NAME); - if (ret) { - dev_err(dev, "request gpio pin %d failed\n", - pins[pn]); - return ret; + if (pins) { + for (pn = 0; pn < AD2S1200_PN; pn++) { + ret = devm_gpio_request_one(dev, pins[pn], + GPIOF_DIR_OUT, + DRV_NAME); + if (ret) { + dev_err(dev, + "Failed to claim gpio %d\n: err=%d", + pins[pn], + ret); + return ret; + } } } @@ -139,8 +145,25 @@ static int ad2s1200_probe(struct spi_device *spi) st = iio_priv(indio_dev); mutex_init(&st->lock); st->sdev = spi; - st->sample = pins[0]; - st->rdvel = pins[1]; + + if (pins) { + st->sample = gpio_to_desc(pins[0]); + st->rdvel = gpio_to_desc(pins[1]); + } else { + st->sample = devm_gpiod_get(dev, "sample", GPIOD_OUT_LOW); + if (IS_ERR(st->sample)) { + dev_err(dev, "Failed to claim SAMPLE gpio: err=%ld\n", + PTR_ERR(st->sample)); + return PTR_ERR(st->sample); + } + + st->rdvel = devm_gpiod_get(dev, "rdvel", GPIOD_OUT_LOW); + if (IS_ERR(st->rdvel)) { + dev_err(dev, "Failed to claim RDVEL gpio: err=%ld\n", + PTR_ERR(st->rdvel)); + return PTR_ERR(st->rdvel); + } + } indio_dev->dev.parent = dev; indio_dev->info = &ad2s1200_info; -- 2.16.2
next prev parent reply other threads:[~2018-04-20 19:30 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-20 19:28 [PATCH v2 00/13] staging: iio: ad2s1200: Driver clean up David Veenstra 2018-04-20 19:28 ` David Veenstra 2018-04-20 19:28 ` [PATCH v2 01/13] staging: iio: ad2s1200: Remove unneeded include David Veenstra 2018-04-20 19:28 ` David Veenstra 2018-04-21 16:45 ` Jonathan Cameron 2018-04-21 16:45 ` Jonathan Cameron 2018-04-20 19:28 ` [PATCH v2 02/13] staging: iio: ad2s1200: Sort includes alphabetically David Veenstra 2018-04-20 19:28 ` David Veenstra 2018-04-21 16:46 ` Jonathan Cameron 2018-04-21 16:46 ` Jonathan Cameron 2018-04-20 19:29 ` [PATCH v2 03/13] staging: iio: ad2s1200: Reverse Christmas tree ordering David Veenstra 2018-04-20 19:29 ` David Veenstra 2018-04-21 16:46 ` Jonathan Cameron 2018-04-21 16:46 ` Jonathan Cameron 2018-04-20 19:29 ` [PATCH v2 04/13] staging: iio: ad2s1200: Add blank lines David Veenstra 2018-04-20 19:29 ` David Veenstra 2018-04-21 16:47 ` Jonathan Cameron 2018-04-21 16:47 ` Jonathan Cameron 2018-04-20 19:30 ` [PATCH v2 05/13] staging: iio: ad2s1200: Add kernel docs to driver state David Veenstra 2018-04-20 19:30 ` David Veenstra 2018-04-21 16:49 ` Jonathan Cameron 2018-04-21 16:49 ` Jonathan Cameron 2018-04-22 14:26 ` David Julian Veenstra 2018-04-22 14:26 ` David Julian Veenstra 2018-04-20 19:30 ` [PATCH v2 06/13] staging: iio: ad2s1200: Introduce variable for repeated value David Veenstra 2018-04-20 19:30 ` David Veenstra 2018-04-21 16:50 ` Jonathan Cameron 2018-04-21 16:50 ` Jonathan Cameron 2018-04-22 14:29 ` David Julian Veenstra 2018-04-22 14:29 ` David Julian Veenstra 2018-04-20 19:30 ` [PATCH v2 07/13] staging: iio: ad2s1200: Improve readability with be16_to_cpup David Veenstra 2018-04-20 19:30 ` David Veenstra 2018-04-21 16:55 ` Jonathan Cameron 2018-04-21 16:55 ` Jonathan Cameron 2018-04-22 14:31 ` David Julian Veenstra 2018-04-22 14:31 ` David Julian Veenstra 2018-04-20 19:30 ` David Veenstra [this message] 2018-04-20 19:30 ` [PATCH v2 08/13] staging: iio: ad2s1200: Replace legacy gpio API with modern API David Veenstra 2018-04-21 16:58 ` Jonathan Cameron 2018-04-21 16:58 ` Jonathan Cameron 2018-04-22 14:32 ` David Julian Veenstra 2018-04-22 14:32 ` David Julian Veenstra 2018-04-20 19:30 ` [PATCH v2 09/13] staging: iio: ad2s1200: Add documentation for device tree binding David Veenstra 2018-04-20 19:30 ` David Veenstra 2018-04-21 17:03 ` Jonathan Cameron 2018-04-21 17:03 ` Jonathan Cameron 2018-04-20 19:31 ` [PATCH v2 10/13] staging: iio: ad2s1200: Add scaling factor for angular velocity channel David Veenstra 2018-04-20 19:31 ` David Veenstra 2018-04-21 17:07 ` Jonathan Cameron 2018-04-21 17:07 ` Jonathan Cameron 2018-04-22 14:37 ` David Julian Veenstra 2018-04-22 14:37 ` David Julian Veenstra 2018-04-20 19:31 ` [PATCH v2 11/13] staging: iio: Documentation: Add missing sysfs docs for angle channel David Veenstra 2018-04-20 19:31 ` David Veenstra 2018-04-21 17:08 ` Jonathan Cameron 2018-04-21 17:08 ` Jonathan Cameron 2018-04-22 14:41 ` David Julian Veenstra 2018-04-22 14:41 ` David Julian Veenstra 2018-04-20 19:31 ` [PATCH v2 12/13] staging: iio: ad2s1200: Add scaling factor " David Veenstra 2018-04-20 19:31 ` David Veenstra 2018-04-21 17:10 ` Jonathan Cameron 2018-04-21 17:10 ` Jonathan Cameron 2018-04-20 19:32 ` [PATCH v2 13/13] staging: iio: ad2s1200: Move driver out of staging David Veenstra 2018-04-20 19:32 ` David Veenstra 2018-04-21 17:11 ` Jonathan Cameron 2018-04-21 17:11 ` Jonathan Cameron
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4253be22c7081a5032b59097bc166f559e7b1cea.1524247563.git.davidjulianveenstra@gmail.com \ --to=davidjulianveenstra@gmail.com \ --cc=Michael.Hennerich@analog.com \ --cc=daniel.baluta@nxp.com \ --cc=devel@driverdev.osuosl.org \ --cc=devicetree@vger.kernel.org \ --cc=jic23@kernel.org \ --cc=knaack.h@gmx.de \ --cc=lars@metafoo.de \ --cc=linux-iio@vger.kernel.org \ --cc=pmeerw@pmeerw.net \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.