From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Rob Herring <robh+dt@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Biju Das <biju.das@bp.renesas.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Adam Thomson <Adam.Thomson.Opensource@diasemi.com>,
Li Jun <jun.li@nxp.com>,
Badhri Jagan Sridharan <badhri@google.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Hans de Goede <hdegoede@redhat.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Min Guo <min.guo@mediatek.com>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-usb@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
Linus Walleij <linus.walleij@linaro.org>,
Nagarjuna Kristam <nkristam@nvidia.com>
Subject: [PATCH next v9 08/11] usb: roles: get usb-role-switch from parent
Date: Tue, 13 Aug 2019 19:27:11 +0800 [thread overview]
Message-ID: <1565695634-9711-9-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1565695634-9711-1-git-send-email-chunfeng.yun@mediatek.com>
when the USB host controller is the parent of the connector,
usually type-B, sometimes don't need the graph, so we should
check whether it's parent registers usb-role-switch or not
firstly, and get it if exists.
Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v9:
1. replace signed-off-by by suggested-by Heikki
2. use class_find_device_by_fwnode()
v8: no changes
v7:
add signed-off-by Chunfeng
v6:
new patch
---
drivers/usb/roles/class.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
index 2abb6fe384ca..94b4e7db2b94 100644
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@ -102,6 +102,19 @@ static void *usb_role_switch_match(struct device_connection *con, int ep,
return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER);
}
+static struct usb_role_switch *
+usb_role_switch_is_parent(struct fwnode_handle *fwnode)
+{
+ struct fwnode_handle *parent = fwnode_get_parent(fwnode);
+ struct device *dev;
+
+ if (!parent || !fwnode_property_present(parent, "usb-role-switch"))
+ return NULL;
+
+ dev = class_find_device_by_fwnode(role_class, parent);
+ return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER);
+}
+
/**
* usb_role_switch_get - Find USB role switch linked with the caller
* @dev: The caller device
@@ -113,8 +126,10 @@ struct usb_role_switch *usb_role_switch_get(struct device *dev)
{
struct usb_role_switch *sw;
- sw = device_connection_find_match(dev, "usb-role-switch", NULL,
- usb_role_switch_match);
+ sw = usb_role_switch_is_parent(dev_fwnode(dev));
+ if (!sw)
+ sw = device_connection_find_match(dev, "usb-role-switch", NULL,
+ usb_role_switch_match);
if (!IS_ERR_OR_NULL(sw))
WARN_ON(!try_module_get(sw->dev.parent->driver->owner));
@@ -134,8 +149,10 @@ struct usb_role_switch *fwnode_usb_role_switch_get(struct fwnode_handle *fwnode)
{
struct usb_role_switch *sw;
- sw = fwnode_connection_find_match(fwnode, "usb-role-switch", NULL,
- usb_role_switch_match);
+ sw = usb_role_switch_is_parent(fwnode);
+ if (!sw)
+ sw = fwnode_connection_find_match(fwnode, "usb-role-switch",
+ NULL, usb_role_switch_match);
if (!IS_ERR_OR_NULL(sw))
WARN_ON(!try_module_get(sw->dev.parent->driver->owner));
--
2.22.0
next prev parent reply other threads:[~2019-08-13 11:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 11:27 [PATCH next v9 00/11] add USB GPIO based connection detection driver Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 01/11] dt-binding: usb: add usb-role-switch property Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 02/11] dt-bindings: connector: add optional properties for Type-B Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 03/11] dt-bindings: usb: add binding for USB GPIO based connection detection driver Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 04/11] dt-bindings: usb: mtu3: add properties about USB Role Switch Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 05/11] usb: roles: Introduce stubs for the exiting functions in role.h Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 06/11] device connection: Add fwnode_connection_find_match() Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 07/11] usb: roles: Add fwnode_usb_role_switch_get() function Chunfeng Yun
2019-08-13 13:01 ` Heikki Krogerus
2019-08-14 4:33 ` Chunfeng Yun
2019-08-13 11:27 ` Chunfeng Yun [this message]
2019-08-13 11:27 ` [PATCH next v9 09/11] usb: common: create Kconfig file Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 10/11] usb: common: add USB GPIO based connection detection driver Chunfeng Yun
2019-08-13 11:27 ` [PATCH next v9 11/11] usb: mtu3: register a USB Role Switch for dual role mode Chunfeng Yun
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=1565695634-9711-9-git-send-email-chunfeng.yun@mediatek.com \
--to=chunfeng.yun@mediatek.com \
--cc=Adam.Thomson.Opensource@diasemi.com \
--cc=andy.shevchenko@gmail.com \
--cc=badhri@google.com \
--cc=biju.das@bp.renesas.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=jun.li@nxp.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=min.guo@mediatek.com \
--cc=nkristam@nvidia.com \
--cc=robh+dt@kernel.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).