usb: gadget: pxa27x_udc: add devicetree support

[mirror_ubuntu-zesty-kernel.git] / drivers / usb / gadget / udc / pxa27x_udc.c

diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index 5280f64683fbe3a95492d8497329bc9b976a64f9..55598c0d083c9c72c36d8d4b1b5da6ad01ebec93 100644 (file)
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -27,6 +27,8 @@
 #include <linux/prefetch.h>
 #include <linux/byteorder/generic.h>
 #include <linux/platform_data/pxa2xx_udc.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
 
 #include <linux/usb.h>
 #include <linux/usb/ch9.h>
@@ -2400,6 +2402,12 @@ static struct pxa_udc memory = {
        }
 };
 
+static struct of_device_id udc_pxa_dt_ids[] = {
+       { .compatible = "marvell,pxa270-udc" },
+       {}
+};
+MODULE_DEVICE_TABLE(of, udc_pxa_dt_ids);
+
 /**
  * pxa_udc_probe - probes the udc device
  * @_dev: platform device
@@ -2427,6 +2435,8 @@ static int pxa_udc_probe(struct platform_device *pdev)
                        udc->gpiod = gpio_to_desc(mach->gpio_pullup);
                }
                udc->udc_command = mach->udc_command;
+       } else {
+               udc->gpiod = devm_gpiod_get(&pdev->dev, NULL);
        }
 
        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2618,6 +2628,7 @@ static struct platform_driver udc_driver = {
        .driver         = {
                .name   = "pxa27x-udc",
                .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(udc_pxa_dt_ids),
        },
        .probe          = pxa_udc_probe,
        .remove         = pxa_udc_remove,