[RFC PATCH 2/5] usb: typec: mux: Find the muxes by also matching against the device node

[Heikki Krogerus <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/typec/mux.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index d990aa510fab..161a96280296 100644
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -11,6 +11,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/property.h>
 #include <linux/usb/typec_mux.h>
 
 static DEFINE_MUTEX(switch_lock);
@@ -23,9 +24,14 @@ static void *typec_switch_match(struct device_connection *con, int ep,
 {
 	struct typec_switch *sw;
 
-	list_for_each_entry(sw, &switch_list, entry)
-		if (!strcmp(con->endpoint[ep], dev_name(sw->dev)))
+	list_for_each_entry(sw, &switch_list, entry) {
+		if (con->fwnode) {
+			if (dev_fwnode(sw->dev) == con->fwnode)
+				return sw;
+		} else if (!strcmp(con->endpoint[ep], dev_name(sw->dev))) {
 			return sw;
+		}
+	}
 
 	/*
 	 * We only get called if a connection was found, tell the caller to
@@ -114,9 +120,14 @@ static void *typec_mux_match(struct device_connection *con, int ep, void *data)
 {
 	struct typec_mux *mux;
 
-	list_for_each_entry(mux, &mux_list, entry)
-		if (!strcmp(con->endpoint[ep], dev_name(mux->dev)))
+	list_for_each_entry(mux, &mux_list, entry) {
+		if (con->fwnode) {
+			if (dev_fwnode(mux->dev) == con->fwnode)
+				return mux;
+		} else if (!strcmp(con->endpoint[ep], dev_name(mux->dev))) {
 			return mux;
+		}
+	}
 
 	/*
 	 * We only get called if a connection was found, tell the caller to
-- 
2.19.1