dm: pinctrl: convert pinctrl-single to livetree

[oweals/u-boot.git] / drivers / pinctrl / pinctrl-stmfx.c

diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index 5431df9813a1c57398a328f876ebd9b1772e2d65..b0e43ae0a16e53f3d29a7b26c6b7f929eafdc678 100644 (file)
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
+#include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
 #include <linux/bitfield.h>
@@ -231,23 +232,23 @@ static int stmfx_pinctrl_conf_set(struct udevice *dev, unsigned int pin,
        switch (param) {
        case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:
        case PIN_CONFIG_BIAS_DISABLE:
+       case PIN_CONFIG_DRIVE_PUSH_PULL:
+               ret = stmfx_pinctrl_set_type(dev, pin, 0);
+               break;
        case PIN_CONFIG_BIAS_PULL_DOWN:
+               ret = stmfx_pinctrl_set_type(dev, pin, 1);
+               if (ret)
+                       return ret;
                ret = stmfx_pinctrl_set_pupd(dev, pin, 0);
                break;
        case PIN_CONFIG_BIAS_PULL_UP:
+               ret = stmfx_pinctrl_set_type(dev, pin, 1);
+               if (ret)
+                       return ret;
                ret = stmfx_pinctrl_set_pupd(dev, pin, 1);
                break;
        case PIN_CONFIG_DRIVE_OPEN_DRAIN:
-               if (dir == GPIOF_OUTPUT)
-                       ret = stmfx_pinctrl_set_type(dev, pin, 1);
-               else
-                       ret = stmfx_pinctrl_set_type(dev, pin, 0);
-               break;
-       case PIN_CONFIG_DRIVE_PUSH_PULL:
-               if (dir == GPIOF_OUTPUT)
-                       ret = stmfx_pinctrl_set_type(dev, pin, 0);
-               else
-                       ret = stmfx_pinctrl_set_type(dev, pin, 1);
+               ret = stmfx_pinctrl_set_type(dev, pin, 1);
                break;
        case PIN_CONFIG_OUTPUT:
                ret = stmfx_gpio_direction_output(plat->gpio, pin, arg);
@@ -351,11 +352,12 @@ static int stmfx_chip_init(struct udevice *dev)
        int ret;
        struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
 
-       id = dm_i2c_reg_read(dev, STMFX_REG_CHIP_ID);
-       if (id < 0) {
-               dev_err(dev, "error reading chip id: %d\n", id);
+       ret = dm_i2c_reg_read(dev, STMFX_REG_CHIP_ID);
+       if (ret < 0) {
+               dev_err(dev, "error reading chip id: %d\n", ret);
                return ret;
        }
+       id = (u8)ret;
        /*
         * Check that ID is the complement of the I2C address:
         * STMFX I2C address follows the 7-bit format (MSB), that's why