From: Carlo Caione Date: Mon, 3 Dec 2018 18:00:42 +0000 (+0000) Subject: pinctrl: meson: Fix GPIO direction registers access X-Git-Tag: v2019.01-rc2~24^2~1 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb19c7bade45e97112f65671dd0c5855c727675a;p=oweals%2Fu-boot.git 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 Reviewed-by: Jerome Brunet Signed-off-by: Neil Armstrong --- 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)