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>

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 30fdc2fd87712054e78cd7ca1997163fe907b337..cc53e63c9ce9390b4f86e018b40bf8d7ae1fcedd 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -88,7 +88,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
                .name           = "ci_hdrc_imx",
                .capoffset      = DEF_CAPOFFSET,
                .flags          = CI_HDRC_REQUIRE_TRANSCEIVER |
-                                 CI_HDRC_PULLUP_ON_VBUS |
                                  CI_HDRC_DISABLE_STREAMING,
        };
        int ret;

diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index fb657ef50a9c1f3c0924d35308b66a05686a9a6d..2d51d852b474ab5af397dd6eaefb3eb48da5db89 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -49,7 +49,6 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
        .name                   = "ci_hdrc_msm",
        .flags                  = CI_HDRC_REGS_SHARED |
                                  CI_HDRC_REQUIRE_TRANSCEIVER |
-                                 CI_HDRC_PULLUP_ON_VBUS |
                                  CI_HDRC_DISABLE_STREAMING,
 
        .notify_event           = ci_hdrc_msm_notify_event,

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 45abf4d46a71047b677887cb9b066fef35c1e8fe..90c3572bd1b0c901f02112677122e1ced4140769 100644 (file)
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1448,9 +1448,6 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
        unsigned long flags;
        int gadget_ready = 0;
 
-       if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS))
-               return -EOPNOTSUPP;
-
        spin_lock_irqsave(&ci->lock, flags);
        ci->vbus_active = is_active;
        if (ci->driver)
@@ -1635,13 +1632,11 @@ static int ci_udc_start(struct usb_gadget *gadget,
 
        ci->driver = driver;
        pm_runtime_get_sync(&ci->gadget.dev);
-       if (ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS) {
-               if (ci->vbus_active) {
-                       hw_device_reset(ci, USBMODE_CM_DC);
-               } else {
-                       pm_runtime_put_sync(&ci->gadget.dev);
-                       goto done;
-               }
+       if (ci->vbus_active) {
+               hw_device_reset(ci, USBMODE_CM_DC);
+       } else {
+               pm_runtime_put_sync(&ci->gadget.dev);
+               goto done;
        }
 
        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);
 
-       if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS) ||
-                       ci->vbus_active) {
+       if (ci->vbus_active) {
                hw_device_state(ci, 0);
                if (ci->platdata->notify_event)
                        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) {
                retval = otg_set_peripheral(ci->transceiver->otg,
                                                &ci->gadget);

diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 10a607ce9090f8e40e030b9e5814920bcfce40ed..7d399671a566ac58afbb3fd17991eb40b069f76d 100644 (file)
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -18,7 +18,6 @@ struct ci_hdrc_platform_data {
        unsigned long    flags;
 #define CI_HDRC_REGS_SHARED            BIT(0)
 #define CI_HDRC_REQUIRE_TRANSCEIVER    BIT(1)
-#define CI_HDRC_PULLUP_ON_VBUS         BIT(2)
 #define CI_HDRC_DISABLE_STREAMING      BIT(3)
        /*
         * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1,