usb: typec: Find the ports by also matching against the device node

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.

Acked-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index 45abe2c7e9f3514dd98c44379e02be3654d30dd6..2eb6238418475182792c385ab80f74d2c9d03d47 100644 (file)
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -9,6 +9,7 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/property.h>
 #include <linux/slab.h>
 
 #include "bus.h"
@@ -204,15 +205,32 @@ static void typec_altmode_put_partner(struct altmode *altmode)
        put_device(&adev->dev);
 }
 
-static int __typec_port_match(struct device *dev, const void *name)
+static int typec_port_fwnode_match(struct device *dev, const void *fwnode)
+{
+       return dev_fwnode(dev) == fwnode;
+}
+
+static int typec_port_name_match(struct device *dev, const void *name)
 {
        return !strcmp((const char *)name, dev_name(dev));
 }
 
 static void *typec_port_match(struct device_connection *con, int ep, void *data)
 {
-       return class_find_device(typec_class, NULL, con->endpoint[ep],
-                                __typec_port_match);
+       struct device *dev;
+
+       /*
+        * FIXME: Check does the fwnode supports the requested SVID. If it does
+        * we need to return ERR_PTR(-PROBE_DEFER) when there is no device.
+        */
+       if (con->fwnode)
+               return class_find_device(typec_class, NULL, con->fwnode,
+                                        typec_port_fwnode_match);
+
+       dev = class_find_device(typec_class, NULL, con->endpoint[ep],
+                               typec_port_name_match);
+
+       return dev ? dev : ERR_PTR(-EPROBE_DEFER);
 }
 
 struct typec_altmode *