>From 47bd18e210fecf701d493c27884e13c69bc449ea Mon Sep 17 00:00:00 2001
From: Paul Zimmerman <pa...@synopsys.com>
Date: Wed, 14 Jan 2015 18:15:58 -0800
Subject: [PATCH] usb: phy: make GPIOs optional for the generic phy

The use of GPIOs should be optional for the generic phy, otherwise
the Altera SOCFPGA platform at least is broken.

Fixes breakage caused by a combination of e9f2cefb0cd "usb: phy: 
generic: migrate to gpio_desc" and 135b3c4304d "usb: dwc2: platform: 
add generic PHY framework support".

Signed-off-by: Paul Zimmerman <pa...@synopsys.com>
---
Based on top of testing/next.

 drivers/usb/phy/phy-generic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index dd05254..9a826ff 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -218,10 +218,10 @@ int usb_phy_gen_create_phy(struct device *dev, struct 
usb_phy_generic *nop,
                        clk_rate = 0;
 
                needs_vcc = of_property_read_bool(node, "vcc-supply");
-               nop->gpiod_reset = devm_gpiod_get(dev, "reset-gpios");
+               nop->gpiod_reset = devm_gpiod_get_optional(dev, "reset-gpios");
                err = PTR_ERR(nop->gpiod_reset);
                if (!err) {
-                       nop->gpiod_vbus = devm_gpiod_get(dev,
+                       nop->gpiod_vbus = devm_gpiod_get_optional(dev,
                                                         "vbus-detect-gpio");
                        err = PTR_ERR(nop->gpiod_vbus);
                }
-- 
1.7.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to