devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Li Jun <b47624-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org>
Cc: Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>,
	gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
	balbi-l0cyMroinI0@public.gmane.org,
	peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org,
	robh+d-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	pawel.moll-5wv7dgnIgG8@public.gmane.org,
	mark.rutland-5wv7dgnIgG8@public.gmane.org,
	macpaul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Subject: Re: [PATCH v6 08/23] usb: chipidea: set usb otg capabilities
Date: Wed, 8 Jul 2015 10:20:25 +0800	[thread overview]
Message-ID: <20150708022024.GB11714@shlinux2> (raw)
In-Reply-To: <559BD358.4040700-l0cyMroinI0@public.gmane.org>

On Tue, Jul 07, 2015 at 04:25:44PM +0300, Roger Quadros wrote:
> On 29/06/15 10:47, Li Jun wrote:
> >Init and update otg capabilities by DT, set gadget's otg capabilities
> >accordingly.
> >
> >Signed-off-by: Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> >---
> >  drivers/usb/chipidea/core.c  | 10 ++++++++++
> >  drivers/usb/chipidea/udc.c   |  7 ++++++-
> >  include/linux/usb/chipidea.h |  1 +
> >  3 files changed, 17 insertions(+), 1 deletion(-)
> >
> >diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> >index 74fea4f..248f571 100644
> >--- a/drivers/usb/chipidea/core.c
> >+++ b/drivers/usb/chipidea/core.c
> >@@ -588,6 +588,16 @@ static int ci_get_platdata(struct device *dev,
> >  				of_usb_host_tpl_support(dev->of_node);
> >  	}
> >
> >+	if (platdata->dr_mode == USB_DR_MODE_OTG) {
> >+		/* We can support HNP and SRP of OTG 2.0 */
> >+		platdata->ci_otg_caps.otg_rev = 0x0200;
> >+		platdata->ci_otg_caps.hnp_support = true;
> >+		platdata->ci_otg_caps.srp_support = true;
> >+
> >+		/* Update otg capabilities by DT properties */
> >+		of_usb_update_otg_caps(dev->of_node, &platdata->ci_otg_caps);
> 
> What if this function fails. e.g. DT contains unsupported OTG version?
Just an error print out, otg-rev will be the initial value(0x0200), it will
work as otg 2.0.

> I think we should error out in that case.
> 
Disable all otg features? or even stop all usb initialization?

Li Jun
> >+	}
> >+
> >  	if (of_usb_get_maximum_speed(dev->of_node) == USB_SPEED_FULL)
> >  		platdata->flags |= CI_HDRC_FORCE_FULLSPEED;
> 
> cheers,
> -roger
> 
> >
> >diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> >index 764f668..b7cca3e 100644
> >--- a/drivers/usb/chipidea/udc.c
> >+++ b/drivers/usb/chipidea/udc.c
> >@@ -1827,6 +1827,7 @@ static irqreturn_t udc_irq(struct ci_hdrc *ci)
> >  static int udc_start(struct ci_hdrc *ci)
> >  {
> >  	struct device *dev = ci->dev;
> >+	struct usb_otg_caps *otg_caps = &ci->platdata->ci_otg_caps;
> >  	int retval = 0;
> >
> >  	spin_lock_init(&ci->lock);
> >@@ -1834,8 +1835,12 @@ static int udc_start(struct ci_hdrc *ci)
> >  	ci->gadget.ops          = &usb_gadget_ops;
> >  	ci->gadget.speed        = USB_SPEED_UNKNOWN;
> >  	ci->gadget.max_speed    = USB_SPEED_HIGH;
> >-	ci->gadget.is_otg       = ci->is_otg ? 1 : 0;
> >  	ci->gadget.name         = ci->platdata->name;
> >+	ci->gadget.otg_caps	= otg_caps;
> >+
> >+	if (otg_caps->hnp_support || otg_caps->srp_support ||
> >+					otg_caps->adp_support)
> >+		ci->gadget.is_otg = 1;
> >
> >  	INIT_LIST_HEAD(&ci->gadget.ep_list);
> >
> >diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
> >index ab94f78..e10cefc 100644
> >--- a/include/linux/usb/chipidea.h
> >+++ b/include/linux/usb/chipidea.h
> >@@ -34,6 +34,7 @@ struct ci_hdrc_platform_data {
> >  #define CI_HDRC_CONTROLLER_STOPPED_EVENT	1
> >  	void	(*notify_event) (struct ci_hdrc *ci, unsigned event);
> >  	struct regulator	*reg_vbus;
> >+	struct usb_otg_caps	ci_otg_caps;
> >  	bool			tpl_support;
> >  };
> >
> >
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2015-07-08  2:20 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-29  7:47 [PATCH v6 00/23] usb gadget update for OTG 2.0 Li Jun
     [not found] ` <1435564082-14583-1-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-29  7:47   ` [PATCH v6 01/23] usb: add usb_otg20_descriptor for OTG 2.0 and above Li Jun
2015-06-29  7:47   ` [PATCH v6 02/23] usb: add USB_OTG_ADP definition Li Jun
2015-06-29  7:47   ` [PATCH v6 03/23] usb: otg: add usb_otg_caps structure for otg capabilities Li Jun
2015-06-29  7:47   ` [PATCH v6 04/23] usb: add usb_otg_caps to usb_gadget structure Li Jun
2015-06-29  7:47   ` [PATCH v6 05/23] usb: gadget: composite: add USB_DT_OTG request handling Li Jun
2015-06-29  7:47   ` [PATCH v6 06/23] doc: dt-binding: usb: add otg related properties Li Jun
2015-06-29  7:47   ` [PATCH v6 07/23] usb: common: add API to update usb otg capabilities by device tree Li Jun
     [not found]     ` <1435564082-14583-8-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-07-07 13:23       ` Roger Quadros
     [not found]         ` <559BD2C2.3050509-l0cyMroinI0@public.gmane.org>
2015-07-08  2:05           ` Li Jun
2015-07-08  9:13             ` Roger Quadros
2015-06-29  7:47   ` [PATCH v6 08/23] usb: chipidea: set usb otg capabilities Li Jun
     [not found]     ` <1435564082-14583-9-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-07-07 13:25       ` Roger Quadros
     [not found]         ` <559BD358.4040700-l0cyMroinI0@public.gmane.org>
2015-07-08  2:20           ` Li Jun [this message]
2015-07-08  8:56             ` Roger Quadros
2015-06-29  7:47   ` [PATCH v6 09/23] usb: chipidea: update ci_otg_is_fsm_mode conditions Li Jun
2015-06-29  7:47   ` [PATCH v6 10/23] usb: gadget: add usb otg descriptor allocate and init interface Li Jun
2015-06-29  7:47   ` [PATCH v6 11/23] usb: gadget: configfs: allocate and init otg descriptor by otg capabilities Li Jun
2015-06-29  7:47   ` [PATCH v6 12/23] usb: gadget: ether: " Li Jun
     [not found]     ` <1435564082-14583-13-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-07-07 13:54       ` Roger Quadros
2015-06-29  7:47   ` [PATCH v6 13/23] usb: gadget: acm_ms: " Li Jun
2015-06-29  7:47   ` [PATCH v6 14/23] usb: gadget: audio: " Li Jun
2015-06-29  7:47   ` [PATCH v6 15/23] usb: gadget: cdc2: " Li Jun
2015-06-29  7:47   ` [PATCH v6 16/23] usb: gadget: g_ffs: " Li Jun
2015-06-29  7:47   ` [PATCH v6 17/23] usb: gadget: hid: " Li Jun
2015-06-29  7:47   ` [PATCH v6 18/23] usb: gadget: mass_storage: " Li Jun
2015-06-29  7:47   ` [PATCH v6 19/23] usb: gadget: multi: " Li Jun
2015-06-29  7:47   ` [PATCH v6 20/23] usb: gadget: ncm: " Li Jun
2015-06-29  7:48   ` [PATCH v6 21/23] usb: gadget: printer: " Li Jun
     [not found]     ` <1435564082-14583-22-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-07-07 13:55       ` Roger Quadros
2015-06-29  7:48   ` [PATCH v6 22/23] usb: gadget: serial: " Li Jun
     [not found]     ` <1435564082-14583-23-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-07-07 13:55       ` Roger Quadros
2015-06-29  7:48   ` [PATCH v6 23/23] usb: gadget: zero: " Li Jun
     [not found]     ` <1435564082-14583-24-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-07-07 13:55       ` Roger Quadros
     [not found]         ` <559BDA44.4040700-l0cyMroinI0@public.gmane.org>
2015-07-08  3:57           ` Li Jun

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=20150708022024.GB11714@shlinux2 \
    --to=b47624-kzfg59tc24xl57midrcfdg@public.gmane.org \
    --cc=balbi-l0cyMroinI0@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
    --cc=jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
    --cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=macpaul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
    --cc=pawel.moll-5wv7dgnIgG8@public.gmane.org \
    --cc=peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
    --cc=robh+d-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=rogerq-l0cyMroinI0@public.gmane.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).