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

Commit c2ec3a73 authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: only get vbus regulator for non-peripheral mode 



If the user chooses peripheral mode for this controller, the vbus
regulator doesn't need to get, since the host will supply the vbus,
it can save one vbus pin for other usage.

Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Tested-by: default avatarFrank Li <frank.li@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d768fcf

drivers/usb/chipidea/core.c

+15 −12
Original line number Diff line number Diff line
@@ -392,26 +392,29 @@ static irqreturn_t ci_irq(int irq, void *data) 
static int ci_get_platdata(struct device *dev,

		struct ci_hdrc_platform_data *platdata)

{

	if (!platdata->phy_mode)

		platdata->phy_mode = of_usb_get_phy_mode(dev->of_node);



	if (!platdata->dr_mode)

		platdata->dr_mode = of_usb_get_dr_mode(dev->of_node);



	if (platdata->dr_mode == USB_DR_MODE_UNKNOWN)

		platdata->dr_mode = USB_DR_MODE_OTG;



	if (platdata->dr_mode != USB_DR_MODE_PERIPHERAL) {

		/* Get the vbus regulator */

		platdata->reg_vbus = devm_regulator_get(dev, "vbus");

		if (PTR_ERR(platdata->reg_vbus) == -EPROBE_DEFER) {

			return -EPROBE_DEFER;

		} else if (PTR_ERR(platdata->reg_vbus) == -ENODEV) {

		platdata->reg_vbus = NULL; /* no vbus regualator is needed */

			/* no vbus regualator is needed */

			platdata->reg_vbus = NULL;

		} else if (IS_ERR(platdata->reg_vbus)) {

			dev_err(dev, "Getting regulator error: %ld\n",

				PTR_ERR(platdata->reg_vbus));

			return PTR_ERR(platdata->reg_vbus);

		}



	if (!platdata->phy_mode)

		platdata->phy_mode = of_usb_get_phy_mode(dev->of_node);



	if (!platdata->dr_mode)

		platdata->dr_mode = of_usb_get_dr_mode(dev->of_node);



	if (platdata->dr_mode == USB_DR_MODE_UNKNOWN)

		platdata->dr_mode = USB_DR_MODE_OTG;

	}



	return 0;

}