gpio: Replace direction_input() and direction_output()

The new update_flags() method is more flexible since it allows the
driver to see the full flags all at once. Use that in preference to these
two functions. Add comments to that effect.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index eb8850dfe5cbeaf051b900cfb419d4df7433249c..f90962a0075a039b342c10d2dd01b8f2244836b2 100644 (file)
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -513,13 +513,10 @@ int gpio_direction_input(unsigned gpio)
        int ret;
 
        ret = gpio_to_device(gpio, &desc);
-       if (ret)
-               return ret;
-       ret = check_reserved(&desc, "dir_input");
        if (ret)
                return ret;
 
-       return gpio_get_ops(desc.dev)->direction_input(desc.dev, desc.offset);
+       return dm_gpio_clrset_flags(&desc, GPIOD_MASK_DIR, GPIOD_IS_IN);
 }
 
 /**
@@ -534,17 +531,17 @@ int gpio_direction_input(unsigned gpio)
 int gpio_direction_output(unsigned gpio, int value)
 {
        struct gpio_desc desc;
+       ulong flags;
        int ret;
 
        ret = gpio_to_device(gpio, &desc);
-       if (ret)
-               return ret;
-       ret = check_reserved(&desc, "dir_output");
        if (ret)
                return ret;
 
-       return gpio_get_ops(desc.dev)->direction_output(desc.dev,
-                                                       desc.offset, value);
+       flags = GPIOD_IS_OUT;
+       if (value)
+               flags |= GPIOD_IS_OUT_ACTIVE;
+       return dm_gpio_clrset_flags(&desc, GPIOD_MASK_DIR, flags);
 }
 
 static int _gpio_get_value(const struct gpio_desc *desc)

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 7d1e19ad531863ba79ffa534aaed4b1c57de21f9..f0c835e60bfbed08276189b17ddd52e9461f7049 100644 (file)
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -260,10 +260,32 @@ int gpio_xlate_offs_flags(struct udevice *dev, struct gpio_desc *desc,
 struct dm_gpio_ops {
        int (*request)(struct udevice *dev, unsigned offset, const char *label);
        int (*rfree)(struct udevice *dev, unsigned int offset);
+
+       /**
+        * direction_input() - deprecated
+        *
+        * Equivalent to set_flags(...GPIOD_IS_IN)
+        */
        int (*direction_input)(struct udevice *dev, unsigned offset);
+
+       /**
+        * direction_output() - deprecated
+        *
+        * Equivalent to set_flags(...GPIOD_IS_OUT) with GPIOD_IS_OUT_ACTIVE
+        * also set if @value
+        */
        int (*direction_output)(struct udevice *dev, unsigned offset,
                                int value);
+
        int (*get_value)(struct udevice *dev, unsigned offset);
+
+       /**
+        * set_value() - Sets the GPIO value of an output
+        *
+        * If the driver provides an @set_flags() method then that is used
+        * in preference to this, with GPIOD_IS_OUT_ACTIVE set according to
+        * @value.
+        */
        int (*set_value)(struct udevice *dev, unsigned offset, int value);
        /**
         * get_function() Get the GPIO function
@@ -320,7 +342,9 @@ struct dm_gpio_ops {
         * uclass, so the driver always sees the value that should be set at the
         * pin (1=high, 0=low).
         *
-        * This method is optional.
+        * This method is required and should be implemented by new drivers. At
+        * some point, it will supersede direction_input() and
+        * direction_output(), which wil be removed.
         *
         * @dev:        GPIO device
         * @offset:     GPIO offset within that device