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 <[email protected]>
Reviewed-by: Jerome Brunet <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>

diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 0bd6152803d7f53719eb2ba0cd4ce156106f1561..b539749752c8420659870b6bd23c093fb9a85777 100644 (file)
--- 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, &reg, &bit);
        if (ret)