MIPS: Lantiq: switch vmmc to use gpiod API

This switches vmmc to use gpiod API instead of OF-specific legacy gpio
API that we want to stop exporting from gpiolib.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/lantiq/xway/vmmc.c b/arch/mips/lantiq/xway/vmmc.c
index 7a14da8..a194730 100644 (file)
--- a/arch/mips/lantiq/xway/vmmc.c
+++ b/arch/mips/lantiq/xway/vmmc.c
@@ -4,9 +4,10 @@
  *  Copyright (C) 2012 John Crispin <john@phrozen.org>
  */
 
+#include <linux/err.h>
 #include <linux/export.h>
+#include <linux/gpio/consumer.h>
 #include <linux/of_platform.h>
-#include <linux/of_gpio.h>
 #include <linux/dma-mapping.h>
 
 #include <lantiq_soc.h>
@@ -25,6 +26,7 @@ EXPORT_SYMBOL(ltq_get_cp1_base);
 static int vmmc_probe(struct platform_device *pdev)
 {
 #define CP1_SIZE       (1 << 20)
+       struct gpio_desc *gpio;
        int gpio_count;
        dma_addr_t dma;
 
@@ -32,16 +34,18 @@ static int vmmc_probe(struct platform_device *pdev)
                (void *) CPHYSADDR(dma_alloc_coherent(&pdev->dev, CP1_SIZE,
                                                    &dma, GFP_KERNEL));
 
-       gpio_count = of_gpio_count(pdev->dev.of_node);
+       gpio_count = gpiod_count(&pdev->dev, NULL);
        while (gpio_count > 0) {
-               enum of_gpio_flags flags;
-               int gpio = of_get_gpio_flags(pdev->dev.of_node,
-                                            --gpio_count, &flags);
-               if (gpio_request(gpio, "vmmc-relay"))
+               gpio = devm_gpiod_get_index(&pdev->dev,
+                                           NULL, --gpio_count, GPIOD_OUT_HIGH);
+               if (IS_ERR(gpio)) {
+                       dev_err(&pdev->dev,
+                               "failed to request GPIO idx %d: %d\n",
+                               gpio_count, PTR_ERR(gpio);
                        continue;
-               dev_info(&pdev->dev, "requested GPIO %d\n", gpio);
-               gpio_direction_output(gpio,
-                                     (flags & OF_GPIO_ACTIVE_LOW) ? (0) : (1));
+               }
+
+               gpio_consumer_set_name(gpio, "vmmc-relay");
        }
 
        dev_info(&pdev->dev, "reserved %dMB at 0x%p", CP1_SIZE >> 20, cp1_base);