Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1502041

[PATCH 04/13] gpio-sx150x: Replace 'io_polarity' with DT binding

Show all headers | View raw

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

diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index e01afd8..9b62133 100644
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -100,11 +100,6 @@ struct sx150x_device_data {
  *                 bit at position n will enable the pull-down for the IO at
  *                 the corresponding offset.  For chips with fewer than
  *                 16 IO pins, high-end bits are ignored.
- * @io_polarity: A bit-mask which enables polarity inversion for each IO line
- *               in the expander.  Setting the bit at position n inverts
- *               the polarity of that IO line, while clearing it results
- *               in normal polarity. For chips with fewer than 16 IO pins,
- *               high-end bits are ignored.
  * @reset_during_probe: If set to true, the driver will trigger a full
  *                      reset of the chip at the beginning of the probe
  *                      in order to place it in a known state.
@@ -113,7 +108,6 @@ struct sx150x_platform_data {
 	bool     oscio_is_gpo;
 	u16      io_pullup_ena;
 	u16      io_pulldn_ena;
-	u16      io_polarity;
 	bool     reset_during_probe;
 };
 
@@ -654,9 +648,15 @@ static int sx150x_init_hw(struct sx150x_chip *chip,
 		return err;
 
 	if (chip->dev_cfg->model == SX150X_789) {
+		u32 io_polarity = 0;
+
+		of_property_read_u32(chip->client->dev.of_node,
+				     "semtech,io-polarity",
+				     &io_polarity);
+
 		err = sx150x_init_io(chip,
-				chip->dev_cfg->pri.x789.reg_polarity,
-				pdata->io_polarity);
+				     chip->dev_cfg->pri.x789.reg_polarity,
+				     (u16)io_polarity);
 		if (err < 0)
 			return err;
 	} else if (chip->dev_cfg->model == SX150X_456) {
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/13] Revamp Semtech SX150x driver Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:30 +0200
  [PATCH 10/13] gpio-sx150x: Replace 'oscio_is_gpio' with DT binding Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:30 +0200
  [PATCH 08/13] gpio-sx150x: Replace 'reset_during_probe" with DT binding Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:30 +0200
  [PATCH 02/13] gpio-sx150x: Remove 'irq_summary' parameter Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:30 +0200
  [PATCH 11/13] bindings: gpio-sx150x: Document "semtech,oscio-is-gpo" binding Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:30 +0200
  [PATCH 06/13] gpio-sx150x: Replace "io_pull*_ena" with DT bindings Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:40 +0200
  [PATCH 04/13] gpio-sx150x: Replace 'io_polarity' with DT binding Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:40 +0200
  [PATCH 05/13] bindings: gpio-sx150x: Document "semtech,io-polarity" binding Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:40 +0200
    Re: [PATCH 05/13] bindings: gpio-sx150x: Document  "semtech,io-polarity" binding Rob Herring <robh@kernel.org> - 2016-10-18 18:30 +0200
  [PATCH 03/13] gpio-sx150x: Remove 'irq_base' parameter Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-10-17 16:40 +0200

csiph-web