From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: Jeffrey Hugo <jhugo@codeaurora.org>,
Linus Walleij <linus.walleij@linaro.org>,
Timur Tabi <timur@kernel.org>, Stephen Boyd <swboyd@chromium.org>,
linux-gpio <linux-gpio@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCH v5 3/3] gpiolib: Show correct direction from the beginning
Date: Fri, 5 Oct 2018 08:53:00 +0200 [thread overview]
Message-ID: <20181005065300.22882-3-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <20181005065300.22882-1-ricardo.ribalda@gmail.com>
Current code assumes that the direction is input if direction_input
function is set.
This might not be the case on GPIOs with programmable direction.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
drivers/gpio/gpiolib.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 907019b67a58..e016b22658ff 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1349,20 +1349,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
spin_unlock_irqrestore(&gpio_lock, flags);
- for (i = 0; i < chip->ngpio; i++) {
- struct gpio_desc *desc = &gdev->descs[i];
-
- desc->gdev = gdev;
-
- /* REVISIT: most hardware initializes GPIOs as inputs (often
- * with pullups enabled) so power usage is minimized. Linux
- * code should set the gpio direction first thing; but until
- * it does, and in case chip->get_direction is not set, we may
- * expose the wrong direction in sysfs.
- */
- desc->flags = !chip->direction_input ? (1 << FLAG_IS_OUT) : 0;
- }
-
#ifdef CONFIG_PINCTRL
INIT_LIST_HEAD(&gdev->pin_ranges);
#endif
@@ -1391,6 +1377,19 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
if (status)
goto err_remove_chip;
+ for (i = 0; i < chip->ngpio; i++) {
+ struct gpio_desc *desc = &gdev->descs[i];
+
+ desc->gdev = gdev;
+
+ if (chip->get_direction && gpiochip_line_is_valid(chip, i))
+ desc->flags = !chip->get_direction(chip, i) ?
+ (1 << FLAG_IS_OUT) : 0;
+ else
+ desc->flags = !chip->direction_input ?
+ (1 << FLAG_IS_OUT) : 0;
+ }
+
acpi_gpiochip_add(chip);
machine_gpiochip_add(chip);
--
2.19.0
next prev parent reply other threads:[~2018-10-05 6:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-05 6:52 [PATCH v5 1/3] gpiolib: Add init_valid_mask exported function Ricardo Ribalda Delgado
2018-10-05 6:52 ` [PATCH v5 2/3] pinctrl: msm: Use " Ricardo Ribalda Delgado
2018-10-07 13:03 ` Timur Tabi
2018-10-10 8:30 ` Linus Walleij
2018-10-05 6:53 ` Ricardo Ribalda Delgado [this message]
2018-10-05 16:17 ` [PATCH v5 3/3] gpiolib: Show correct direction from the beginning Jeffrey Hugo
2018-10-05 16:54 ` Timur Tabi
2018-10-05 20:44 ` Timur Tabi
2018-10-09 17:14 ` Jeffrey Hugo
2018-10-10 8:31 ` Linus Walleij
2018-10-11 12:18 ` Vignesh R
2018-10-11 13:42 ` Ricardo Ribalda Delgado
2018-10-12 5:59 ` Vignesh R
2018-10-12 6:03 ` Linus Walleij
2018-10-12 9:00 ` REGRESSION: " Marcel Ziswiler
2018-10-12 9:08 ` Linus Walleij
2018-10-12 9:34 ` Marcel Ziswiler
2018-10-10 7:55 ` [PATCH v5 1/3] gpiolib: Add init_valid_mask exported function Linus Walleij
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=20181005065300.22882-3-ricardo.ribalda@gmail.com \
--to=ricardo.ribalda@gmail.com \
--cc=jhugo@codeaurora.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=swboyd@chromium.org \
--cc=timur@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).