Sharp's Spitz board still uses the legacy GPIO interface for controlling
a GPIO pin related to the USB host controller.

Convert this function to use the new GPIO descriptor interface.

Reviewed-by: Linus Walleij <redacted>
Signed-off-by: Duje Mihanović <duje.mihanovic@skole.hr>
---
 arch/arm/mach-pxa/spitz.c      | 13 ++++++-------
 drivers/usb/host/ohci-pxa27x.c |  7 +++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index cc691b199429..535e2b2e997b 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c

@@ -649,23 +649,22 @@ static inline void spitz_mmc_init(void) {}
  * USB Host
  ******************************************************************************/
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+GPIO_LOOKUP_SINGLE(spitz_usb_host_gpio_table, "pxa27x-ohci", "gpio-pxa",
+               SPITZ_GPIO_USB_HOST, "usb-host", GPIO_ACTIVE_LOW);
+
 static int spitz_ohci_init(struct device *dev)
 {
-       int err;
-
-       err = gpio_request(SPITZ_GPIO_USB_HOST, "USB_HOST");
-       if (err)
-               return err;
+       gpiod_add_lookup_table(&spitz_usb_host_gpio_table);

        /* Only Port 2 is connected, setup USB Port 2 Output Control Register */
        UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;

-       return gpio_direction_output(SPITZ_GPIO_USB_HOST, 1);
+       return 0;
 }

 static void spitz_ohci_exit(struct device *dev)
 {
-       gpio_free(SPITZ_GPIO_USB_HOST);
+       gpiod_remove_lookup_table(&spitz_usb_host_gpio_table);
 }

 static struct pxaohci_platform_data spitz_ohci_platform_data = {

diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 357d9aee38a3..7f04421c80d6 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c

@@ -121,6 +121,7 @@ struct pxa27x_ohci {
        void __iomem    *mmio_base;
        struct regulator *vbus[3];
        bool            vbus_enabled[3];
+       struct gpio_desc *usb_host;
 };

 #define to_pxa27x_ohci(hcd)    (struct pxa27x_ohci *)(hcd_to_ohci(hcd)->priv)

@@ -447,6 +448,10 @@ static int ohci_hcd_pxa27x_probe(struct platform_device *pdev)
        pxa_ohci = to_pxa27x_ohci(hcd);
        pxa_ohci->clk = usb_clk;
        pxa_ohci->mmio_base = (void __iomem *)hcd->regs;
+       pxa_ohci->usb_host = devm_gpiod_get_optional(&pdev->dev, "usb-host", GPIOD_OUT_LOW);
+       if (IS_ERR(pxa_ohci->usb_host))
+               return dev_err_probe(&pdev->dev, PTR_ERR(pxa_ohci->usb_host),
+                               "failed to get USB host GPIO\n");

        for (i = 0; i < 3; ++i) {
                char name[6];

@@ -512,6 +517,8 @@ static void ohci_hcd_pxa27x_remove(struct platform_device *pdev)
        for (i = 0; i < 3; ++i)
                pxa27x_ohci_set_vbus_power(pxa_ohci, i, false);

+       gpiod_put(pxa_ohci->usb_host);