Unverified Commit 7fd87c95 authored by Peter Chen's avatar Peter Chen
Browse files

usb: chipidea: udc: using structure ci_hdrc device for runtime PM 



At current code, it doesn't maintain ci->gadget.dev's runtime PM
status well, eg, during the PM operation, the PM counter for
ci->gadget.dev doesn't be changed accordingly.

In this commit, we use ci_hdrc device instead of ci->gadget.dev
for runtime PM APIs at udc driver, in the way, we handle runtime
PM APIs using unify device structure between core and udc driver.

Reviewed-by: default avatarJun Li <jun.li@nxp.com>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
parent 6a7c533d

drivers/usb/chipidea/udc.c

+5 −8
Original line number Diff line number Diff line
@@ -1533,7 +1533,7 @@ static void ci_hdrc_gadget_connect(struct usb_gadget *_gadget, int is_active) 
	unsigned long flags;



	if (is_active) {

		pm_runtime_get_sync(&_gadget->dev);

		pm_runtime_get_sync(ci->dev);

		hw_device_reset(ci);

		spin_lock_irqsave(&ci->lock, flags);

		if (ci->driver) {
@@ -1551,7 +1551,7 @@ static void ci_hdrc_gadget_connect(struct usb_gadget *_gadget, int is_active) 
			ci->platdata->notify_event(ci,

			CI_HDRC_CONTROLLER_STOPPED_EVENT);

		_gadget_stop_activity(&ci->gadget);

		pm_runtime_put_sync(&_gadget->dev);

		pm_runtime_put_sync(ci->dev);

		usb_gadget_set_state(_gadget, USB_STATE_NOTATTACHED);

	}

}
@@ -1636,12 +1636,12 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on) 
	if (ci_otg_is_fsm_mode(ci) || ci->role == CI_ROLE_HOST)

		return 0;



	pm_runtime_get_sync(&ci->gadget.dev);

	pm_runtime_get_sync(ci->dev);

	if (is_on)

		hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS);

	else

		hw_write(ci, OP_USBCMD, USBCMD_RS, 0);

	pm_runtime_put_sync(&ci->gadget.dev);

	pm_runtime_put_sync(ci->dev);



	return 0;

}
@@ -1839,7 +1839,7 @@ static int ci_udc_stop(struct usb_gadget *gadget) 
			CI_HDRC_CONTROLLER_STOPPED_EVENT);

		_gadget_stop_activity(&ci->gadget);

		spin_lock_irqsave(&ci->lock, flags);

		pm_runtime_put(&ci->gadget.dev);

		pm_runtime_put(ci->dev);

	}



	spin_unlock_irqrestore(&ci->lock, flags);
@@ -1970,9 +1970,6 @@ static int udc_start(struct ci_hdrc *ci) 
	if (retval)

		goto destroy_eps;



	pm_runtime_no_callbacks(&ci->gadget.dev);

	pm_runtime_enable(&ci->gadget.dev);



	return retval;



destroy_eps:

CRA Git | Maintained and supported by SUSTech CRA and CCSE