devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: 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
Cc: 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,
	rogerq-l0cyMroinI0@public.gmane.org,
	Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Subject: [PATCH v6 07/23] usb: common: add API to update usb otg capabilities by device tree
Date: Mon, 29 Jun 2015 15:47:46 +0800	[thread overview]
Message-ID: <1435564082-14583-8-git-send-email-jun.li@freescale.com> (raw)
In-Reply-To: <1435564082-14583-1-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>

Check property of usb hardware to update otg version and disable SRP, HNP
and ADP if its disable flag is present.

Signed-off-by: Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
 drivers/usb/common/common.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
 include/linux/usb/of.h      |  7 +++++++
 2 files changed, 54 insertions(+)

diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index b530fd4..10c986b 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -154,6 +154,53 @@ bool of_usb_host_tpl_support(struct device_node *np)
 	return false;
 }
 EXPORT_SYMBOL_GPL(of_usb_host_tpl_support);
+
+/**
+ * of_usb_update_otg_caps - to update usb otg capabilities according to
+ * the passed properties in DT.
+ * @np: Pointer to the given device_node
+ * @otg_caps: Pointer to the target usb_otg_caps to be set
+ *
+ * The function updates the otg capabilities
+ */
+int of_usb_update_otg_caps(struct device_node *np,
+			struct usb_otg_caps *otg_caps)
+{
+	u32 otg_rev;
+
+	if (!otg_caps)
+		return -EINVAL;
+
+	if (!of_property_read_u32(np, "otg-rev", &otg_rev)) {
+		switch (otg_rev) {
+		case 0x0100:
+		case 0x0120:
+		case 0x0130:
+		case 0x0200:
+		case 0x0300:
+			otg_caps->otg_rev = otg_rev;
+			break;
+		default:
+			pr_err("%s: unsupported otg-rev: 0x%x\n",
+						np->full_name, otg_rev);
+			return -EINVAL;
+		}
+	} else {
+		otg_caps->otg_rev = 0;
+	}
+
+	if (of_find_property(np, "hnp-disable", NULL))
+		otg_caps->hnp_support = false;
+	if (of_find_property(np, "srp-disable", NULL))
+		otg_caps->srp_support = false;
+	if (of_find_property(np, "adp-disable", NULL) ||
+				(otg_caps->otg_rev < 0x0200))
+		otg_caps->adp_support = false;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(of_usb_update_otg_caps);
+
 #endif
 
 MODULE_LICENSE("GPL");
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
index cfe0528..8c5a818 100644
--- a/include/linux/usb/of.h
+++ b/include/linux/usb/of.h
@@ -15,6 +15,8 @@
 enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np);
 enum usb_device_speed of_usb_get_maximum_speed(struct device_node *np);
 bool of_usb_host_tpl_support(struct device_node *np);
+int of_usb_update_otg_caps(struct device_node *np,
+			struct usb_otg_caps *otg_caps);
 #else
 static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np)
 {
@@ -30,6 +32,11 @@ static inline bool of_usb_host_tpl_support(struct device_node *np)
 {
 	return false;
 }
+static inline int of_usb_update_otg_caps(struct device_node *np,
+				struct usb_otg_caps *otg_caps)
+{
+	return 0;
+}
 #endif
 
 #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_SUPPORT)
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" 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-06-29  7:47 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   ` Li Jun [this message]
     [not found]     ` <1435564082-14583-8-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-07-07 13:23       ` [PATCH v6 07/23] usb: common: add API to update usb otg capabilities by device tree 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
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=1435564082-14583-8-git-send-email-jun.li@freescale.com \
    --to=jun.li-kzfg59tc24xl57midrcfdg@public.gmane.org \
    --cc=balbi-l0cyMroinI0@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@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).