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

Commit 5076ae55 authored by Neil Zhang's avatar Neil Zhang Committed by Felipe Balbi
Browse files

usb: gadget: mv_udc: refine suspend/resume function 



This patch impletments system suspend/resume functions for Marvell
otg controller.
If OTG is enabled, OTG driver will do most of the work.
If not, we will check clock gating.
  If clock gating is enabled, the UDC will be start/stop automatically.
  If not, UDC will be start/stop in suspend/resume functions.

Signed-off-by: default avatarNeil Zhang <zhangwm@marvell.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 85ff7bfb

drivers/usb/gadget/mv_udc_core.c

+36 −11
Original line number Diff line number Diff line
@@ -2447,8 +2447,31 @@ static int mv_udc_suspend(struct device *_dev) 
{

	struct mv_udc *udc = the_controller;



	/* if OTG is enabled, the following will be done in OTG driver*/

	if (udc->transceiver)

		return 0;



	if (udc->pdata->vbus && udc->pdata->vbus->poll)

		if (udc->pdata->vbus->poll() == VBUS_HIGH) {

			dev_info(&udc->dev->dev, "USB cable is connected!\n");

			return -EAGAIN;

		}



	/*

	 * only cable is unplugged, udc can suspend.

	 * So do not care about clock_gating == 1.

	 */

	if (!udc->clock_gating) {

		udc_stop(udc);



		spin_lock_irq(&udc->lock);

		/* stop all usb activities */

		stop_activity(udc, udc->driver);

		spin_unlock_irq(&udc->lock);



		mv_udc_disable_internal(udc);

	}



	return 0;

}
@@ -2457,19 +2480,21 @@ static int mv_udc_resume(struct device *_dev) 
	struct mv_udc *udc = the_controller;

	int retval;



	if (udc->pdata->phy_init) {

		retval = udc->pdata->phy_init(udc->phy_regs);

		if (retval) {

			dev_err(&udc->dev->dev,

				"init phy error %d when resume back\n",

				retval);

	/* if OTG is enabled, the following will be done in OTG driver*/

	if (udc->transceiver)

		return 0;



	if (!udc->clock_gating) {

		retval = mv_udc_enable_internal(udc);

		if (retval)

			return retval;

		}

	}



		if (udc->driver && udc->softconnect) {

			udc_reset(udc);

			ep0_reset(udc);

			udc_start(udc);

		}

	}



	return 0;

}