openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: chipidea: retire flag CI_HDRC_PULLUP_ON_VBUS 

Currently, the controller only runs when the ci->vbus_active is true.
So the flag CI_HDRC_PULLUP_ON_VBUS is useless no longer.
If the user doesn't have otgsc, he/she needs to change ci_handle_vbus_change
to update ci->vbus_active.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Chen 2013-08-14 12:44:14 +03:00 committed by Greg Kroah-Hartman
parent e7e621eb84
commit d268e9bc23
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/chipidea/ci_hdrc_imx.c
View File

@ -88,7 +88,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
.name = "ci_hdrc_imx", .name = "ci_hdrc_imx",
.capoffset = DEF_CAPOFFSET, .capoffset = DEF_CAPOFFSET,
.flags = CI_HDRC_REQUIRE_TRANSCEIVER | .flags = CI_HDRC_REQUIRE_TRANSCEIVER |
CI_HDRC_PULLUP_ON_VBUS |
CI_HDRC_DISABLE_STREAMING, CI_HDRC_DISABLE_STREAMING,
}; };
int ret; int ret;

1
drivers/usb/chipidea/ci_hdrc_msm.c
View File

@ -49,7 +49,6 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
.name = "ci_hdrc_msm", .name = "ci_hdrc_msm",
.flags = CI_HDRC_REGS_SHARED | .flags = CI_HDRC_REGS_SHARED |
CI_HDRC_REQUIRE_TRANSCEIVER | CI_HDRC_REQUIRE_TRANSCEIVER |
CI_HDRC_PULLUP_ON_VBUS |
CI_HDRC_DISABLE_STREAMING, CI_HDRC_DISABLE_STREAMING,
.notify_event = ci_hdrc_msm_notify_event, .notify_event = ci_hdrc_msm_notify_event,

24
drivers/usb/chipidea/udc.c
View File

@ -1448,9 +1448,6 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
unsigned long flags; unsigned long flags;
int gadget_ready = 0; int gadget_ready = 0;
if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS))
return -EOPNOTSUPP;
spin_lock_irqsave(&ci->lock, flags); spin_lock_irqsave(&ci->lock, flags);
ci->vbus_active = is_active; ci->vbus_active = is_active;
if (ci->driver) if (ci->driver)
@ -1635,13 +1632,11 @@ static int ci_udc_start(struct usb_gadget *gadget,
ci->driver = driver; ci->driver = driver;
pm_runtime_get_sync(&ci->gadget.dev); pm_runtime_get_sync(&ci->gadget.dev);
if (ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS) { if (ci->vbus_active) {
if (ci->vbus_active) { hw_device_reset(ci, USBMODE_CM_DC);
hw_device_reset(ci, USBMODE_CM_DC); } else {
} else { pm_runtime_put_sync(&ci->gadget.dev);
pm_runtime_put_sync(&ci->gadget.dev); goto done;
goto done;
}
} }
retval = hw_device_state(ci, ci->ep0out->qh.dma); retval = hw_device_state(ci, ci->ep0out->qh.dma);
@ -1664,8 +1659,7 @@ static int ci_udc_stop(struct usb_gadget *gadget,
spin_lock_irqsave(&ci->lock, flags); spin_lock_irqsave(&ci->lock, flags);
if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS) || if (ci->vbus_active) {
ci->vbus_active) {
hw_device_state(ci, 0); hw_device_state(ci, 0);
if (ci->platdata->notify_event) if (ci->platdata->notify_event)
ci->platdata->notify_event(ci, ci->platdata->notify_event(ci,
@ -1800,12 +1794,6 @@ static int udc_start(struct ci_hdrc *ci)
} }
} }
if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS)) {
retval = hw_device_reset(ci, USBMODE_CM_DC);
if (retval)
goto put_transceiver;
}
if (ci->transceiver) { if (ci->transceiver) {
retval = otg_set_peripheral(ci->transceiver->otg, retval = otg_set_peripheral(ci->transceiver->otg,
&ci->gadget); &ci->gadget);

1
include/linux/usb/chipidea.h
View File

@ -18,7 +18,6 @@ struct ci_hdrc_platform_data {
unsigned long flags; unsigned long flags;
#define CI_HDRC_REGS_SHARED BIT(0) #define CI_HDRC_REGS_SHARED BIT(0)
#define CI_HDRC_REQUIRE_TRANSCEIVER BIT(1) #define CI_HDRC_REQUIRE_TRANSCEIVER BIT(1)
#define CI_HDRC_PULLUP_ON_VBUS BIT(2)
#define CI_HDRC_DISABLE_STREAMING BIT(3) #define CI_HDRC_DISABLE_STREAMING BIT(3)
/* /*
* Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1, * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1,