[09/18] gpio: sch311x: Use RMW to change direction

Message ID	20180629063544.3826-9-linus.walleij@linaro.org
State	Accepted
Commit	4a2398d7211f8f750b717ce4a2b0d117385f2a4a
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Linus Walleij <linus.walleij@linaro.org> To: linux-gpio@vger.kernel.org Cc: Linus Walleij <linus.walleij@linaro.org>, Bruno Randolf <br1@einfach.org> Subject: [PATCH 09/18] gpio: sch311x: Use RMW to change direction Date: Fri, 29 Jun 2018 08:35:35 +0200 Message-Id: <20180629063544.3826-9-linus.walleij@linaro.org> In-Reply-To: <20180629063544.3826-1-linus.walleij@linaro.org> References: <20180629063544.3826-1-linus.walleij@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk
Series	[01/18] gpio: rc5t583: Include the right header \| expand [01/18] gpio: rc5t583: Include the right header [02/18] gpio: rcar: Include the right header [03/18] gpio: rdc321x: Include the right header [04/18] gpio: sa1100: Include the right header [05/18] gpio: sch: Include the right header [06/18] gpio: sch: Implement .get_direction() [07/18] gpio: sch311x: Include the right header [08/18] gpio: sch311x: Implement .get_direction() [09/18] gpio: sch311x: Use RMW to change direction [10/18] gpio: sch311x: Implement open drain support [11/18] gpio: sch311x: Replace unsigned char with u8 [12/18] gpio: spear-spics: Include the right header [13/18] gpio: sta2x11: Include the right header [14/18] gpio: sta2x11: Use BIT() macro [15/18] gpio: sta2x11: Inline regs macro [16/18] gpio: stmpe: Include the right header [17/18] gpio: stp-xway: Include the right header [18/18] gpio: syscon: Include the right header

Message ID

20180629063544.3826-9-linus.walleij@linaro.org

State

Accepted

Commit

4a2398d7211f8f750b717ce4a2b0d117385f2a4a

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as
	permitted sender) client-ip=209.132.180.67; 
From: Linus Walleij <linus.walleij@linaro.org>
To: linux-gpio@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>, Bruno Randolf <br1@einfach.org>
Subject: [PATCH 09/18] gpio: sch311x: Use RMW to change direction
Date: Fri, 29 Jun 2018 08:35:35 +0200
Message-Id: <20180629063544.3826-9-linus.walleij@linaro.org>
In-Reply-To: <20180629063544.3826-1-linus.walleij@linaro.org>
References: <20180629063544.3826-1-linus.walleij@linaro.org>
Sender: linux-gpio-owner@vger.kernel.org
Precedence: bulk

Series

[01/18] gpio: rc5t583: Include the right header | expand

Commit Message

Linus Walleij June 29, 2018, 6:35 a.m. UTC

Bit 0 in the config register obviously controls the direction
of the GPIO so instead of hammering 0x0/0x1 into that register,
use read-modify-write so that we can also alter the other bits
in the register.

Cc: Bruno Randolf <br1@einfach.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
 drivers/gpio/gpio-sch311x.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

-- 
2.17.0

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

diff --git a/drivers/gpio/gpio-sch311x.c b/drivers/gpio/gpio-sch311x.c
index ed64f7fa23b1..faf44178f97b 100644
--- a/drivers/gpio/gpio-sch311x.c
+++ b/drivers/gpio/gpio-sch311x.c
@@ -23,10 +23,9 @@ 
 
 #define DRV_NAME			"gpio-sch311x"
 
-#define SCH311X_GPIO_CONF_OUT		0x00
-#define SCH311X_GPIO_CONF_IN		0x01
-#define SCH311X_GPIO_CONF_INVERT	0x02
-#define SCH311X_GPIO_CONF_OPEN_DRAIN	0x80
+#define SCH311X_GPIO_CONF_DIR		BIT(0)
+#define SCH311X_GPIO_CONF_INVERT	BIT(1)
+#define SCH311X_GPIO_CONF_OPEN_DRAIN	BIT(7)
 
 #define SIO_CONFIG_KEY_ENTER		0x55
 #define SIO_CONFIG_KEY_EXIT		0xaa
@@ -196,10 +195,12 @@  static void sch311x_gpio_set(struct gpio_chip *chip, unsigned offset,
 static int sch311x_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
 {
 	struct sch311x_gpio_block *block = gpiochip_get_data(chip);
+	unsigned char data;
 
 	spin_lock(&block->lock);
-	outb(SCH311X_GPIO_CONF_IN, block->runtime_reg +
-	     block->config_regs[offset]);
+	data = inb(block->runtime_reg + block->config_regs[offset]);
+	data |= SCH311X_GPIO_CONF_DIR;
+	outb(data, block->runtime_reg + block->config_regs[offset]);
 	spin_unlock(&block->lock);
 
 	return 0;
@@ -209,12 +210,13 @@  static int sch311x_gpio_direction_out(struct gpio_chip *chip, unsigned offset,
 				      int value)
 {
 	struct sch311x_gpio_block *block = gpiochip_get_data(chip);
+	unsigned char data;
 
 	spin_lock(&block->lock);
 
-	outb(SCH311X_GPIO_CONF_OUT, block->runtime_reg +
-	     block->config_regs[offset]);
-
+	data = inb(block->runtime_reg + block->config_regs[offset]);
+	data &= ~SCH311X_GPIO_CONF_DIR;
+	outb(data, block->runtime_reg + block->config_regs[offset]);
 	__sch311x_gpio_set(block, offset, value);
 
 	spin_unlock(&block->lock);
@@ -230,7 +232,7 @@  static int sch311x_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
 	data = inb(block->runtime_reg + block->config_regs[offset]);
 	spin_unlock(&block->lock);
 
-	return !!(data & SCH311X_GPIO_CONF_IN);
+	return !!(data & SCH311X_GPIO_CONF_DIR);
 }
 
 static int sch311x_gpio_probe(struct platform_device *pdev)

[09/18] gpio: sch311x: Use RMW to change direction

Commit Message

Patch