aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/gadget/udc/pxa27x_udc.c2
-rw-r--r--drivers/usb/phy/phy-generic.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index b51226abade6..042f06b52677 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -2422,7 +2422,7 @@ static int pxa_udc_probe(struct platform_device *pdev)
2422 } 2422 }
2423 udc->udc_command = mach->udc_command; 2423 udc->udc_command = mach->udc_command;
2424 } else { 2424 } else {
2425 udc->gpiod = devm_gpiod_get(&pdev->dev, NULL); 2425 udc->gpiod = devm_gpiod_get(&pdev->dev, NULL, GPIOD_ASIS);
2426 } 2426 }
2427 2427
2428 regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); 2428 regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index deee68eafb72..ec6ecd03269c 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -218,11 +218,13 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop,
218 clk_rate = 0; 218 clk_rate = 0;
219 219
220 needs_vcc = of_property_read_bool(node, "vcc-supply"); 220 needs_vcc = of_property_read_bool(node, "vcc-supply");
221 nop->gpiod_reset = devm_gpiod_get_optional(dev, "reset"); 221 nop->gpiod_reset = devm_gpiod_get_optional(dev, "reset",
222 GPIOD_ASIS);
222 err = PTR_ERR_OR_ZERO(nop->gpiod_reset); 223 err = PTR_ERR_OR_ZERO(nop->gpiod_reset);
223 if (!err) { 224 if (!err) {
224 nop->gpiod_vbus = devm_gpiod_get_optional(dev, 225 nop->gpiod_vbus = devm_gpiod_get_optional(dev,
225 "vbus-detect"); 226 "vbus-detect",
227 GPIOD_ASIS);
226 err = PTR_ERR_OR_ZERO(nop->gpiod_vbus); 228 err = PTR_ERR_OR_ZERO(nop->gpiod_vbus);
227 } 229 }
228 } else if (pdata) { 230 } else if (pdata) {