commit 798cd708d5e41fa86b0ff49ee996db9b9833e430
author Patrice Chotard <patrice.chotard@st.com> Thu Aug 09 11:57:57 2018 +0200
committer Tom Rini <trini@konsulko.com> Mon Sep 10 20:48:18 2018 -0400
tree 2222d28647f2e02c00723af4d73412afb5673b6a
parent c8e570167f8a2eadbd5f3c7a2b38a9e3796cea19

gpio: stm32f7: replace ODR update by BSRR write

Replace clrsetbits on ODR register (2 operations: one read + one write)
by writing on the correct bit (SET or RESET) of the BSRR register
(only 1 write operation).

Moreover this register if safe for simultaneous access by 2 master on
the bus.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>

drivers/gpio/stm32f7_gpio.c

diff --git a/drivers/gpio/stm32f7_gpio.c b/drivers/gpio/stm32f7_gpio.c
index 5b08e7e..4c0786f 100644
--- a/drivers/gpio/stm32f7_gpio.c
+++ b/drivers/gpio/stm32f7_gpio.c
@@ -18,7 +18,7 @@
 #define STM32_GPIOS_PER_BANK		16
 #define MODE_BITS(gpio_pin)		(gpio_pin * 2)
 #define MODE_BITS_MASK			3
-#define IN_OUT_BIT_INDEX(gpio_pin)	(1UL << (gpio_pin))
+#define BSRR_BIT(gpio_pin, value)	BIT(gpio_pin + (value ? 0 : 16))
 
 static int stm32_gpio_direction_input(struct udevice *dev, unsigned offset)
 {
@@ -41,8 +41,8 @@
 	int mask = MODE_BITS_MASK << bits_index;
 
 	clrsetbits_le32(&regs->moder, mask, STM32_GPIO_MODE_OUT << bits_index);
-	mask = IN_OUT_BIT_INDEX(offset);
-	clrsetbits_le32(&regs->odr, mask, value ? mask : 0);
+
+	writel(BSRR_BIT(offset, value), &regs->bsrr);
 
 	return 0;
 }
@@ -52,16 +52,15 @@
 	struct stm32_gpio_priv *priv = dev_get_priv(dev);
 	struct stm32_gpio_regs *regs = priv->regs;
 
-	return readl(&regs->idr) & IN_OUT_BIT_INDEX(offset) ? 1 : 0;
+	return readl(&regs->idr) & BIT(offset) ? 1 : 0;
 }
 
 static int stm32_gpio_set_value(struct udevice *dev, unsigned offset, int value)
 {
 	struct stm32_gpio_priv *priv = dev_get_priv(dev);
 	struct stm32_gpio_regs *regs = priv->regs;
-	int mask = IN_OUT_BIT_INDEX(offset);
 
-	clrsetbits_le32(&regs->odr, mask, value ? mask : 0);
+	writel(BSRR_BIT(offset, value), &regs->bsrr);
 
 	return 0;
 }