All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-gpio@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>,
	Alexandre Courbot <gnurou@gmail.com>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	cphealy@gmail.com, Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 07/10] gpio-sx150x: Replace 'oscio_is_gpio' with DT binding
Date: Wed, 19 Oct 2016 07:04:03 -0700	[thread overview]
Message-ID: <1476885846-16469-8-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1476885846-16469-1-git-send-email-andrew.smirnov@gmail.com>

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/gpio/gpio-sx150x.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index a63f6ea..044ff3d 100644
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -92,7 +92,6 @@ struct sx150x_device_data {
  *                output-only GPO pin will be added at the end of the block.
  */
 struct sx150x_platform_data {
-	bool     oscio_is_gpo;
 };
 
 struct sx150x_chip {
@@ -553,8 +552,6 @@ static void sx150x_init_chip(struct sx150x_chip *chip,
 	chip->gpio_chip.of_node          = client->dev.of_node;
 	chip->gpio_chip.of_gpio_n_cells  = 2;
 #endif
-	if (pdata->oscio_is_gpo)
-		++chip->gpio_chip.ngpio;
 
 	chip->irq_chip.name                = client->name;
 	chip->irq_chip.irq_mask            = sx150x_irq_mask;
@@ -670,10 +667,6 @@ static int sx150x_init_hw(struct sx150x_chip *chip,
 			return err;
 	}
 
-
-	if (pdata->oscio_is_gpo)
-		sx150x_set_oscio(chip, 0);
-
 	return err;
 }
 
@@ -706,6 +699,7 @@ static int sx150x_probe(struct i2c_client *client,
 	struct sx150x_platform_data *pdata;
 	struct sx150x_chip *chip;
 	int rc;
+	bool oscio_is_gpo;
 
 	pdata = dev_get_platdata(&client->dev);
 	if (!pdata)
@@ -719,11 +713,21 @@ static int sx150x_probe(struct i2c_client *client,
 	if (!chip)
 		return -ENOMEM;
 
+	oscio_is_gpo = of_property_read_bool(client->dev.of_node,
+					     "semtech,oscio-is-gpo");
+
 	sx150x_init_chip(chip, client, id->driver_data, pdata);
+
+	if (oscio_is_gpo)
+		chip->gpio_chip.ngpio++;
+
 	rc = sx150x_init_hw(chip, pdata);
 	if (rc < 0)
 		return rc;
 
+	if (oscio_is_gpo)
+		sx150x_set_oscio(chip, 0);
+
 	rc = devm_gpiochip_add_data(&client->dev, &chip->gpio_chip, chip);
 	if (rc)
 		return rc;
-- 
2.5.5


  parent reply	other threads:[~2016-10-19 14:21 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-19 14:03 [PATCH v2 00/10] Revamp Semtech SX150x driver Andrey Smirnov
2016-10-19 14:03 ` [PATCH v2 01/10] gpio-sx150x: Remove 'gpio_base' from pdata Andrey Smirnov
2016-10-19 14:03 ` [PATCH v2 02/10] gpio-sx150x: Remove 'irq_summary' parameter Andrey Smirnov
2016-10-19 14:03 ` [PATCH v2 03/10] gpio-sx150x: Remove 'irq_base' parameter Andrey Smirnov
2016-10-19 14:04 ` [PATCH v2 04/10] gpio-sx150x: Replace 'io_polarity' with DT binding Andrey Smirnov
2016-10-19 14:04 ` [PATCH v2 05/10] gpio-sx150x: Replace "io_pull*_ena" with DT bindings Andrey Smirnov
2016-10-19 14:04 ` [PATCH v2 06/10] gpio-sx150x: Replace 'reset_during_probe" with DT binding Andrey Smirnov
2016-10-19 14:04 ` Andrey Smirnov [this message]
2016-10-19 14:04 ` [PATCH v2 08/10] gpio-sx150x: Remove struct sx150x_platform_data Andrey Smirnov
2016-10-19 14:04 ` [PATCH v2 09/10] gpio-sx150x: Pass device type in DT match table Andrey Smirnov
2016-10-19 14:04 ` [PATCH v2 10/10] bindings: gpio-sx150x: Document new bindings Andrey Smirnov
     [not found] ` <1476885846-16469-1-git-send-email-andrew.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-20 19:08   ` [PATCH v2 00/10] Revamp Semtech SX150x driver Linus Walleij
2016-10-20 19:08     ` Linus Walleij
2016-10-20 19:34     ` Andrey Smirnov
2016-10-21  9:17       ` Neil Armstrong

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=1476885846-16469-8-git-send-email-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=cphealy@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gnurou@gmail.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --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: link
Be 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.