From: peter.chen@freescale.com (Peter Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v15 12/13] usb: chipidea: retire flag CI_HDRC_PULLUP_ON_VBUS
Date: Mon, 12 Aug 2013 09:22:58 +0800 [thread overview]
Message-ID: <1376270579-13493-13-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1376270579-13493-1-git-send-email-peter.chen@freescale.com>
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>
---
drivers/usb/chipidea/ci_hdrc_imx.c | 1 -
drivers/usb/chipidea/ci_hdrc_msm.c | 1 -
drivers/usb/chipidea/udc.c | 24 ++++++------------------
include/linux/usb/chipidea.h | 1 -
4 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index bd1fe25..ab3e74a 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -91,7 +91,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 fb657ef..2d51d85 100644
--- 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 45abf4d..90c3572 100644
--- 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 10a607c..7d39967 100644
--- 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,
--
1.7.1
next prev parent reply other threads:[~2013-08-12 1:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-12 1:22 [PATCH v15 00/13] Add tested id switch and vbus connect detect support for Chipidea Peter Chen
2013-08-12 1:22 ` [PATCH v15 01/13] usb: chipidea: move vbus regulator operation to core Peter Chen
2013-08-12 1:22 ` [PATCH v15 02/13] usb: chipidea: host: add vbus regulator control Peter Chen
2013-08-12 1:22 ` [PATCH v15 03/13] usb: chipidea: udc: otg_set_peripheral is useless for some chipidea users Peter Chen
2013-08-12 1:22 ` [PATCH v15 04/13] usb: chipidea: otg: Add otg file used to access otgsc Peter Chen
2013-08-12 1:22 ` [PATCH v15 05/13] usb: chipidea: Add role init and destroy APIs Peter Chen
2013-08-12 1:22 ` [PATCH v15 06/13] usb: chipidea: add flag CI_HDRC_DUAL_ROLE_NOT_OTG Peter Chen
2013-08-12 1:22 ` [PATCH v15 07/13] usb: chipidea: disable all interrupts and clear all interrupts status Peter Chen
2013-08-12 1:22 ` [PATCH v15 08/13] usb: chipidea: move otg related things to otg file Peter Chen
2013-08-12 1:22 ` [PATCH v15 09/13] usb: chipidea: add vbus interrupt handler Peter Chen
2013-08-12 1:22 ` [PATCH v15 10/13] usb: chipidea: add wait vbus lower than OTGSC_BSV before role starts Peter Chen
2013-08-12 1:22 ` [PATCH v15 11/13] usb: chipidea: udc: misuse flag CI_HDRC_REGS_SHARED and CI_HDRC_PULLUP_ON_VBUS Peter Chen
2013-08-12 1:22 ` Peter Chen [this message]
2013-08-12 1:22 ` [PATCH v15 13/13] usb: chipidea: udc: .pullup is valid only when vbus is there Peter Chen
2013-08-13 23:43 ` [PATCH v15 00/13] Add tested id switch and vbus connect detect support for Chipidea Peter Chen
2013-08-14 9:48 ` Alexander Shishkin
2013-08-26 16:06 ` Hector Palacios
2013-08-26 16:24 ` Hector Palacios
2013-08-27 2:51 ` Peter Chen
2013-08-27 7:06 ` Hector Palacios
2013-08-27 8:09 ` Alexander Shishkin
2013-08-27 8:12 ` Hector Palacios
2013-08-27 10:20 ` Hector Palacios
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376270579-13493-13-git-send-email-peter.chen@freescale.com \
--to=peter.chen@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).