usb: chipidea: parameter 'mode' isn't needed for hw_device_reset
The hw_device_reset is dedicated to be used at device mode initializaiton, so delete the parameter 'mode'. For host driver, the ehci driver will handle all things. Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
cdd278f21e
commit
5b1573005a
|
@ -352,7 +352,7 @@ u32 hw_read_intr_enable(struct ci_hdrc *ci);
|
|||
|
||||
u32 hw_read_intr_status(struct ci_hdrc *ci);
|
||||
|
||||
int hw_device_reset(struct ci_hdrc *ci, u32 mode);
|
||||
int hw_device_reset(struct ci_hdrc *ci);
|
||||
|
||||
int hw_port_test_set(struct ci_hdrc *ci, u8 mode);
|
||||
|
||||
|
|
|
@ -410,7 +410,7 @@ static int hw_controller_reset(struct ci_hdrc *ci)
|
|||
*
|
||||
* This function returns an error code
|
||||
*/
|
||||
int hw_device_reset(struct ci_hdrc *ci, u32 mode)
|
||||
int hw_device_reset(struct ci_hdrc *ci)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -440,12 +440,12 @@ int hw_device_reset(struct ci_hdrc *ci, u32 mode)
|
|||
|
||||
/* USBMODE should be configured step by step */
|
||||
hw_write(ci, OP_USBMODE, USBMODE_CM, USBMODE_CM_IDLE);
|
||||
hw_write(ci, OP_USBMODE, USBMODE_CM, mode);
|
||||
hw_write(ci, OP_USBMODE, USBMODE_CM, USBMODE_CM_DC);
|
||||
/* HW >= 2.3 */
|
||||
hw_write(ci, OP_USBMODE, USBMODE_SLOM, USBMODE_SLOM);
|
||||
|
||||
if (hw_read(ci, OP_USBMODE, USBMODE_CM) != mode) {
|
||||
pr_err("cannot enter in %s mode", ci_role(ci)->name);
|
||||
if (hw_read(ci, OP_USBMODE, USBMODE_CM) != USBMODE_CM_DC) {
|
||||
pr_err("cannot enter in %s device mode", ci_role(ci)->name);
|
||||
pr_err("lpm = %i", ci->hw_bank.lpm);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
|
@ -543,7 +543,7 @@ static int ci_otg_start_host(struct otg_fsm *fsm, int on)
|
|||
ci_role_start(ci, CI_ROLE_HOST);
|
||||
} else {
|
||||
ci_role_stop(ci);
|
||||
hw_device_reset(ci, USBMODE_CM_DC);
|
||||
hw_device_reset(ci);
|
||||
ci_role_start(ci, CI_ROLE_GADGET);
|
||||
}
|
||||
mutex_lock(&fsm->lock);
|
||||
|
|
|
@ -1471,7 +1471,7 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
|
|||
if (gadget_ready) {
|
||||
if (is_active) {
|
||||
pm_runtime_get_sync(&_gadget->dev);
|
||||
hw_device_reset(ci, USBMODE_CM_DC);
|
||||
hw_device_reset(ci);
|
||||
hw_device_state(ci, ci->ep0out->qh.dma);
|
||||
usb_gadget_set_state(_gadget, USB_STATE_POWERED);
|
||||
} else {
|
||||
|
@ -1660,7 +1660,7 @@ static int ci_udc_start(struct usb_gadget *gadget,
|
|||
pm_runtime_get_sync(&ci->gadget.dev);
|
||||
if (ci->vbus_active) {
|
||||
spin_lock_irqsave(&ci->lock, flags);
|
||||
hw_device_reset(ci, USBMODE_CM_DC);
|
||||
hw_device_reset(ci);
|
||||
} else {
|
||||
pm_runtime_put_sync(&ci->gadget.dev);
|
||||
return retval;
|
||||
|
|
Loading…
Reference in a new issue