From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Chen Yu <chenyu56@huawei.com>, Jun Li <jun.li@nxp.com>,
Hans de Goede <hdegoede@redhat.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 6/9] usb: roles: Find the muxes by also matching against the device node
Date: Wed, 30 Jan 2019 19:02:56 +0300 [thread overview]
Message-ID: <20190130160259.46919-7-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <20190130160259.46919-1-heikki.krogerus@linux.intel.com>
When the connections are defined in firmware, struct
device_connection will have the fwnode member pointing to
the device node (struct fwnode_handle) of the requested
device, and the endpoint will not be used at all in that
case.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/usb/roles/class.c | 21 ++++++++++++++++++---
include/linux/usb/role.h | 1 +
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
index 99116af07f1d..f45d8df5cfb8 100644
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@ -8,6 +8,7 @@
*/
#include <linux/usb/role.h>
+#include <linux/property.h>
#include <linux/device.h>
#include <linux/module.h>
#include <linux/mutex.h>
@@ -84,7 +85,12 @@ enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw)
}
EXPORT_SYMBOL_GPL(usb_role_switch_get_role);
-static int __switch_match(struct device *dev, const void *name)
+static int switch_fwnode_match(struct device *dev, const void *fwnode)
+{
+ return dev_fwnode(dev) == fwnode;
+}
+
+static int switch_name_match(struct device *dev, const void *name)
{
return !strcmp((const char *)name, dev_name(dev));
}
@@ -94,8 +100,16 @@ static void *usb_role_switch_match(struct device_connection *con, int ep,
{
struct device *dev;
- dev = class_find_device(role_class, NULL, con->endpoint[ep],
- __switch_match);
+ if (con->fwnode) {
+ if (!fwnode_property_present(con->fwnode, con->id))
+ return NULL;
+
+ dev = class_find_device(role_class, NULL, con->fwnode,
+ switch_fwnode_match);
+ } else {
+ dev = class_find_device(role_class, NULL, con->endpoint[ep],
+ switch_name_match);
+ }
return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER);
}
@@ -266,6 +280,7 @@ usb_role_switch_register(struct device *parent,
sw->get = desc->get;
sw->dev.parent = parent;
+ sw->dev.fwnode = desc->fwnode;
sw->dev.class = role_class;
sw->dev.type = &usb_role_dev_type;
dev_set_name(&sw->dev, "%s-role-switch", dev_name(parent));
diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h
index edc51be4a77c..9684a8734757 100644
--- a/include/linux/usb/role.h
+++ b/include/linux/usb/role.h
@@ -32,6 +32,7 @@ typedef enum usb_role (*usb_role_switch_get_t)(struct device *dev);
* usb_role_switch_register() before registering the switch.
*/
struct usb_role_switch_desc {
+ struct fwnode_handle *fwnode;
struct device *usb2_port;
struct device *usb3_port;
struct device *udc;
--
2.20.1
next prev parent reply other threads:[~2019-01-30 16:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 16:02 [PATCH v2 0/9] device connection: Add support for device graphs Heikki Krogerus
2019-01-30 16:02 ` [PATCH v2 1/9] platform/x86: intel_cht_int33fe: Prepare for better mux naming scheme Heikki Krogerus
2019-01-30 16:02 ` [PATCH v2 2/9] usb: typec: Rationalize the API for the muxes Heikki Krogerus
2019-01-30 16:02 ` [PATCH v2 3/9] platform/x86: intel_cht_int33fe: Remove old style mux connections Heikki Krogerus
2019-01-30 16:02 ` [PATCH v2 4/9] device connection: Add fwnode member to struct device_connection Heikki Krogerus
2019-01-30 16:02 ` [PATCH v2 5/9] usb: typec: mux: Find the muxes by also matching against the device node Heikki Krogerus
2019-01-30 16:02 ` Heikki Krogerus [this message]
2019-02-11 9:58 ` [PATCH v2 6/9] usb: roles: " Jun Li
2019-02-11 10:46 ` Heikki Krogerus
2019-02-11 12:40 ` Heikki Krogerus
2019-02-12 6:03 ` Jun Li
2019-02-12 8:50 ` Heikki Krogerus
2019-02-12 10:41 ` Jun Li
2019-02-12 11:24 ` Heikki Krogerus
2019-01-30 16:02 ` [PATCH v2 7/9] usb: typec: Find the ports " Heikki Krogerus
2019-01-30 16:51 ` Andy Shevchenko
2019-01-31 13:35 ` Heikki Krogerus
2019-02-11 8:39 ` Heikki Krogerus
2019-02-11 11:52 ` Andy Shevchenko
2019-01-30 16:02 ` [PATCH v2 8/9] device connection: Prepare support for firmware described connections Heikki Krogerus
2019-01-30 16:02 ` [PATCH v2 9/9] device connection: Find device connections also from device graphs Heikki Krogerus
2019-01-31 10:06 ` [PATCH v2 0/9] device connection: Add support for " Hans de Goede
2019-01-31 13:36 ` Heikki Krogerus
2019-02-12 10:44 ` Jun Li
2019-02-12 11:31 ` Heikki Krogerus
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=20190130160259.46919-7-heikki.krogerus@linux.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=chenyu56@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=jun.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.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).