Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 512de1ce authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

usb: ohci-da8xx: drop the vbus GPIO 



All users now setup a fixed regulator for the vbus supply. We can drop
the vbus GPIO code.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 274e4c33

drivers/usb/host/ohci-da8xx.c

+5 −27
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct da8xx_ohci_hcd { 
	struct phy *usb11_phy;

	struct regulator *vbus_reg;

	struct notifier_block nb;

	struct gpio_desc *vbus_gpio;

	struct gpio_desc *oc_gpio;

};
@@ -91,11 +90,6 @@ static int ohci_da8xx_set_power(struct usb_hcd *hcd, int on) 
	struct device *dev = hcd->self.controller;

	int ret;



	if (da8xx_ohci->vbus_gpio) {

		gpiod_set_value_cansleep(da8xx_ohci->vbus_gpio, on);

		return 0;

	}



	if (!da8xx_ohci->vbus_reg)

		return 0;
@@ -120,9 +114,6 @@ static int ohci_da8xx_get_power(struct usb_hcd *hcd) 
{

	struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);



	if (da8xx_ohci->vbus_gpio)

		return gpiod_get_value_cansleep(da8xx_ohci->vbus_gpio);



	if (da8xx_ohci->vbus_reg)

		return regulator_is_enabled(da8xx_ohci->vbus_reg);
@@ -155,9 +146,6 @@ static int ohci_da8xx_has_set_power(struct usb_hcd *hcd) 
{

	struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd);



	if (da8xx_ohci->vbus_gpio)

		return 1;



	if (da8xx_ohci->vbus_reg)

		return 1;
@@ -208,16 +196,11 @@ static irqreturn_t ohci_da8xx_oc_thread(int irq, void *data) 
	struct device *dev = da8xx_ohci->hcd->self.controller;

	int ret;



	if (gpiod_get_value_cansleep(da8xx_ohci->oc_gpio)) {

		if (da8xx_ohci->vbus_gpio) {

			gpiod_set_value_cansleep(da8xx_ohci->vbus_gpio, 0);

		} else if (da8xx_ohci->vbus_reg) {

	if (gpiod_get_value_cansleep(da8xx_ohci->oc_gpio) &&

	    da8xx_ohci->vbus_reg) {

		ret = regulator_disable(da8xx_ohci->vbus_reg);

		if (ret)

				dev_err(dev,

					"Failed to disable regulator: %d\n",

					ret);

		}

			dev_err(dev, "Failed to disable regulator: %d\n", ret);

	}



	return IRQ_HANDLED;
@@ -431,11 +414,6 @@ static int ohci_da8xx_probe(struct platform_device *pdev) 
		}

	}



	da8xx_ohci->vbus_gpio = devm_gpiod_get_optional(dev, "vbus",

							GPIOD_OUT_HIGH);

	if (IS_ERR(da8xx_ohci->vbus_gpio))

		goto err;



	da8xx_ohci->oc_gpio = devm_gpiod_get_optional(dev, "oc", GPIOD_IN);

	if (IS_ERR(da8xx_ohci->oc_gpio))

		goto err;