[U-Boot] [PATCH] pinctrl: meson: Fix GPIO direction registers access

The macros used to set the direction of the GPIO pins are misused, resulting in a wrong behavior when trying to read the GPIO input level from U-Boot.
A better macro is also used when setting the output direction.
Signed-off-by: Carlo Caione ccaione@baylibre.com --- drivers/pinctrl/meson/pinctrl-meson.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 0bd6152803..b539749752 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -136,7 +136,7 @@ int meson_gpio_direction_input(struct udevice *dev, unsigned int offset) if (ret) return ret;
- clrsetbits_le32(priv->reg_gpio + reg, BIT(bit), 1); + setbits_le32(priv->reg_gpio + reg, BIT(bit));
return 0; } @@ -152,7 +152,7 @@ int meson_gpio_direction_output(struct udevice *dev, if (ret) return ret;
- clrsetbits_le32(priv->reg_gpio + reg, BIT(bit), 0); + clrbits_le32(priv->reg_gpio + reg, BIT(bit));
ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_OUT, ®, &bit); if (ret)

On Mon, 2018-12-03 at 18:00 +0000, Carlo Caione wrote:
The macros used to set the direction of the GPIO pins are misused, resulting in a wrong behavior when trying to read the GPIO input level from U-Boot.
A better macro is also used when setting the output direction.
Signed-off-by: Carlo Caione ccaione@baylibre.com
drivers/pinctrl/meson/pinctrl-meson.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 0bd6152803..b539749752 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -136,7 +136,7 @@ int meson_gpio_direction_input(struct udevice *dev, unsigned int offset) if (ret) return ret;
- clrsetbits_le32(priv->reg_gpio + reg, BIT(bit), 1);
setbits_le32(priv->reg_gpio + reg, BIT(bit));
return 0;
} @@ -152,7 +152,7 @@ int meson_gpio_direction_output(struct udevice *dev, if (ret) return ret;
- clrsetbits_le32(priv->reg_gpio + reg, BIT(bit), 0);
clrbits_le32(priv->reg_gpio + reg, BIT(bit));
ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_OUT, ®, &bit); if (ret)
Reviewed-by: Jerome Brunet jbrunet@baylibre.com

On 05/12/2018 08:44, Jerome Brunet wrote:
On Mon, 2018-12-03 at 18:00 +0000, Carlo Caione wrote:
The macros used to set the direction of the GPIO pins are misused, resulting in a wrong behavior when trying to read the GPIO input level from U-Boot.
A better macro is also used when setting the output direction.
Signed-off-by: Carlo Caione ccaione@baylibre.com
drivers/pinctrl/meson/pinctrl-meson.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 0bd6152803..b539749752 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -136,7 +136,7 @@ int meson_gpio_direction_input(struct udevice *dev, unsigned int offset) if (ret) return ret;
- clrsetbits_le32(priv->reg_gpio + reg, BIT(bit), 1);
setbits_le32(priv->reg_gpio + reg, BIT(bit));
return 0;
} @@ -152,7 +152,7 @@ int meson_gpio_direction_output(struct udevice *dev, if (ret) return ret;
- clrsetbits_le32(priv->reg_gpio + reg, BIT(bit), 0);
clrbits_le32(priv->reg_gpio + reg, BIT(bit));
ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_OUT, ®, &bit); if (ret)
Reviewed-by: Jerome Brunet jbrunet@baylibre.com
Thanks,
Applied !
Neil
participants (3)
-
Carlo Caione
-
Jerome Brunet
-
Neil Armstrong