USB: FHCI: Switch to GPIO descriptors

This driver for the PPC Freescale SoC is using device tree
accessors and imperative GPIO semantics control using the old
GPIO API, switch it over to use GPIO descriptors.

Cc: Li Yang <leoyang.li@nxp.com>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Zhao Qiang <qiang.zhao@freescale.com>
Cc: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220831082932.488724-1-linus.walleij@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 2ba09c3fbc2f2d5a74879771f1e95aff57b0f5ec..95a44462bed04bb55066ab363cda28aed389e745 100644 (file)
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -25,8 +25,8 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-#include <linux/of_gpio.h>
 #include <linux/slab.h>
+#include <linux/gpio/consumer.h>
 #include <soc/fsl/qe/qe.h>
 #include <asm/fsl_gtm.h>
 #include "fhci.h"
@@ -150,15 +150,15 @@ int fhci_ioports_check_bus_state(struct fhci_hcd *fhci)
        u8 bits = 0;
 
        /* check USBOE,if transmitting,exit */
-       if (!gpio_get_value(fhci->gpios[GPIO_USBOE]))
+       if (!gpiod_get_value(fhci->gpiods[GPIO_USBOE]))
                return -1;
 
        /* check USBRP */
-       if (gpio_get_value(fhci->gpios[GPIO_USBRP]))
+       if (gpiod_get_value(fhci->gpiods[GPIO_USBRP]))
                bits |= 0x2;
 
        /* check USBRN */
-       if (gpio_get_value(fhci->gpios[GPIO_USBRN]))
+       if (gpiod_get_value(fhci->gpiods[GPIO_USBRN]))
                bits |= 0x1;
 
        return bits;
@@ -630,40 +630,23 @@ static int of_fhci_probe(struct platform_device *ofdev)
 
        /* GPIOs and pins */
        for (i = 0; i < NUM_GPIOS; i++) {
-               int gpio;
-               enum of_gpio_flags flags;
-
-               gpio = of_get_gpio_flags(node, i, &flags);
-               fhci->gpios[i] = gpio;
-               fhci->alow_gpios[i] = flags & OF_GPIO_ACTIVE_LOW;
-
-               if (!gpio_is_valid(gpio)) {
-                       if (i < GPIO_SPEED) {
-                               dev_err(dev, "incorrect GPIO%d: %d\n",
-                                       i, gpio);
-                               goto err_gpios;
-                       } else {
-                               dev_info(dev, "assuming board doesn't have "
-                                       "%s gpio\n", i == GPIO_SPEED ?
-                                       "speed" : "power");
-                               continue;
-                       }
-               }
+               if (i < GPIO_SPEED)
+                       fhci->gpiods[i] = devm_gpiod_get_index(dev,
+                                       NULL, i, GPIOD_IN);
+
+               else
+                       fhci->gpiods[i] = devm_gpiod_get_index_optional(dev,
+                                       NULL, i, GPIOD_OUT_LOW);
 
-               ret = gpio_request(gpio, dev_name(dev));
-               if (ret) {
-                       dev_err(dev, "failed to request gpio %d", i);
+               if (IS_ERR(fhci->gpiods[i])) {
+                       dev_err(dev, "incorrect GPIO%d: %ld\n",
+                               i, PTR_ERR(fhci->gpiods[i]));
                        goto err_gpios;
                }
-
-               if (i >= GPIO_SPEED) {
-                       ret = gpio_direction_output(gpio, 0);
-                       if (ret) {
-                               dev_err(dev, "failed to set gpio %d as "
-                                       "an output\n", i);
-                               i++;
-                               goto err_gpios;
-                       }
+               if (!fhci->gpiods[i]) {
+                       dev_info(dev, "assuming board doesn't have "
+                                "%s gpio\n", i == GPIO_SPEED ?
+                                "speed" : "power");
                }
        }
 
@@ -766,10 +749,6 @@ err_pins:
        while (--j >= 0)
                qe_pin_free(fhci->pins[j]);
 err_gpios:
-       while (--i >= 0) {
-               if (gpio_is_valid(fhci->gpios[i]))
-                       gpio_free(fhci->gpios[i]);
-       }
        cpm_muram_free(pram_addr);
 err_pram:
        iounmap(hcd->regs);
@@ -782,18 +761,12 @@ static int fhci_remove(struct device *dev)
 {
        struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct fhci_hcd *fhci = hcd_to_fhci(hcd);
-       int i;
        int j;
 
        usb_remove_hcd(hcd);
        free_irq(fhci->timer->irq, hcd);
        gtm_put_timer16(fhci->timer);
        cpm_muram_free(cpm_muram_offset(fhci->pram));
-       for (i = 0; i < NUM_GPIOS; i++) {
-               if (!gpio_is_valid(fhci->gpios[i]))
-                       continue;
-               gpio_free(fhci->gpios[i]);
-       }
        for (j = 0; j < NUM_PINS; j++)
                qe_pin_free(fhci->pins[j]);
        fhci_dfs_destroy(fhci);

diff --git a/drivers/usb/host/fhci-hub.c b/drivers/usb/host/fhci-hub.c
index c359dcdb9b13787d20ebead7d42ff479ee49ce00..5f48660ebdfa299d0c51a8b1f3aa1303f3b69d18 100644 (file)
--- a/drivers/usb/host/fhci-hub.c
+++ b/drivers/usb/host/fhci-hub.c
@@ -19,7 +19,7 @@
 #include <linux/io.h>
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <soc/fsl/qe/qe.h>
 #include "fhci.h"
 
@@ -38,13 +38,12 @@ static u8 root_hub_des[] = {
 
 static void fhci_gpio_set_value(struct fhci_hcd *fhci, int gpio_nr, bool on)
 {
-       int gpio = fhci->gpios[gpio_nr];
-       bool alow = fhci->alow_gpios[gpio_nr];
+       struct gpio_desc *gpiod = fhci->gpiods[gpio_nr];
 
-       if (!gpio_is_valid(gpio))
+       if (!gpiod)
                return;
 
-       gpio_set_value(gpio, on ^ alow);
+       gpiod_set_value(gpiod, on);
        mdelay(5);
 }
 
@@ -129,9 +128,9 @@ void fhci_io_port_generate_reset(struct fhci_hcd *fhci)
 {
        fhci_dbg(fhci, "-> %s\n", __func__);
 
-       gpio_direction_output(fhci->gpios[GPIO_USBOE], 0);
-       gpio_direction_output(fhci->gpios[GPIO_USBTP], 0);
-       gpio_direction_output(fhci->gpios[GPIO_USBTN], 0);
+       gpiod_direction_output(fhci->gpiods[GPIO_USBOE], 0);
+       gpiod_direction_output(fhci->gpiods[GPIO_USBTP], 0);
+       gpiod_direction_output(fhci->gpiods[GPIO_USBTN], 0);
 
        mdelay(5);
 

diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h
index 81fbc019a9b3e979d7f441f903cd08d2a75c56a8..1f57b0989485a59f2a13bbd0c8a7828556d44616 100644 (file)
--- a/drivers/usb/host/fhci.h
+++ b/drivers/usb/host/fhci.h
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
+#include <linux/gpio/consumer.h>
 #include <soc/fsl/qe/qe.h>
 #include <soc/fsl/qe/immap_qe.h>
 
@@ -242,8 +243,7 @@ struct fhci_hcd {
        enum qe_clock fullspeed_clk;
        enum qe_clock lowspeed_clk;
        struct qe_pin *pins[NUM_PINS];
-       int gpios[NUM_GPIOS];
-       bool alow_gpios[NUM_GPIOS];
+       struct gpio_desc *gpiods[NUM_GPIOS];
 
        struct qe_usb_ctlr __iomem *regs; /* I/O memory used to communicate */
        struct fhci_pram __iomem *pram; /* Parameter RAM */