All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v4 08/12] gpio: dw: Return output value when direction is out
Date: Wed, 24 Jun 2020 06:29:43 -0400	[thread overview]
Message-ID: <20200624102947.359794-9-seanga2@gmail.com> (raw)
In-Reply-To: <20200624102947.359794-1-seanga2@gmail.com>

dm_gpio_ops.get_value can be called when the gpio is either input or
output. The current dw code always returns the input value, which is
invalid if the direction is set to out.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com>
---
This patch was previously submitted as part of
https://patchwork.ozlabs.org/project/uboot/list/?series=161576

(no changes since v3)

Changes in v3:
- Undo reorder to prevent use-before-declared error

Changes in v2:
- Reorder changes to minimize diff

 drivers/gpio/dwapb_gpio.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index a52c9e18e3..37916e7771 100644
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -66,13 +66,6 @@ static int dwapb_gpio_direction_output(struct udevice *dev, unsigned pin,
 	return 0;
 }
 
-static int dwapb_gpio_get_value(struct udevice *dev, unsigned pin)
-{
-	struct gpio_dwapb_platdata *plat = dev_get_platdata(dev);
-	return !!(readl(plat->base + GPIO_EXT_PORT(plat->bank)) & (1 << pin));
-}
-
-
 static int dwapb_gpio_set_value(struct udevice *dev, unsigned pin, int val)
 {
 	struct gpio_dwapb_platdata *plat = dev_get_platdata(dev);
@@ -98,6 +91,18 @@ static int dwapb_gpio_get_function(struct udevice *dev, unsigned offset)
 		return GPIOF_INPUT;
 }
 
+static int dwapb_gpio_get_value(struct udevice *dev, unsigned pin)
+{
+	struct gpio_dwapb_platdata *plat = dev_get_platdata(dev);
+	u32 value;
+
+	if (dwapb_gpio_get_function(dev, pin) == GPIOF_OUTPUT)
+		value = readl(plat->base + GPIO_SWPORT_DR(plat->bank));
+	else
+		value = readl(plat->base + GPIO_EXT_PORT(plat->bank));
+	return !!(value & BIT(pin));
+}
+
 static const struct dm_gpio_ops gpio_dwapb_ops = {
 	.direction_input	= dwapb_gpio_direction_input,
 	.direction_output	= dwapb_gpio_direction_output,
-- 
2.26.2

  parent reply	other threads:[~2020-06-24 10:29 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-24 10:29 [PATCH v4 00/12] riscv: Add FPIOA and GPIO support for Kendryte K210 Sean Anderson
2020-06-24 10:29 ` [PATCH v4 01/12] pinctrl: Add pinmux property support to pinctrl-generic Sean Anderson
2020-06-24 10:29 ` [PATCH v4 02/12] pinctrl: Reformat documentation in dm/pinctrl.h Sean Anderson
2020-07-03  0:46   ` Simon Glass
2020-06-24 10:29 ` [PATCH v4 03/12] test: pinmux: Add test for pin muxing Sean Anderson
2020-07-03  0:46   ` Simon Glass
2020-06-24 10:29 ` [PATCH v4 04/12] pinctrl: Add support for Kendryte K210 FPIOA Sean Anderson
2020-07-03  0:46   ` Simon Glass
2020-06-24 10:29 ` [PATCH v4 05/12] gpio: sifive: Use generic reg read function Sean Anderson
2020-07-03  0:46   ` Simon Glass
2020-06-24 10:29 ` [PATCH v4 06/12] gpio: dw: Fix warnings about casting int to pointer Sean Anderson
2020-06-24 10:29 ` [PATCH v4 07/12] gpio: dw: Add a trailing underscore to generated name Sean Anderson
2020-07-03  0:46   ` Simon Glass
2020-06-24 10:29 ` Sean Anderson [this message]
2020-06-24 10:29 ` [PATCH v4 09/12] led: gpio: Default to using node name if label is absent Sean Anderson
2020-06-24 10:29 ` [PATCH v4 10/12] test: dm: Test for default led naming Sean Anderson
2020-07-03  0:46   ` Simon Glass
2020-06-24 10:29 ` [PATCH v4 11/12] riscv: Add pinmux and gpio bindings for Kendryte K210 Sean Anderson
2020-07-03  0:46   ` Simon Glass
2020-06-24 10:29 ` [PATCH v4 12/12] riscv: Add FPIOA and GPIO support " Sean Anderson
2020-08-12 14:03 ` [PATCH v4 00/12] " Sean Anderson
2020-08-14  0:37   ` Rick Chen
2020-08-14  1:52     ` Sean Anderson

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=20200624102947.359794-9-seanga2@gmail.com \
    --to=seanga2@gmail.com \
    --cc=u-boot@lists.denx.de \
    /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.