Selaa lähdekoodia

rpmsg: Enable matching devices with drivers based on DT

Make it possible to match rpmsg devices based on device tree node, in
addition to the id table. In some of these cases the rpmsg driver would
not have a id_table, so make this optional.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Bjorn Andersson 9 vuotta sitten
vanhempi
commit
a16644cb3a
1 muutettua tiedostoa jossa 6 lisäystä ja 4 poistoa
  1. 6 4
      drivers/rpmsg/virtio_rpmsg_bus.c

+ 6 - 4
drivers/rpmsg/virtio_rpmsg_bus.c

@@ -33,6 +33,7 @@
 #include <linux/wait.h>
 #include <linux/wait.h>
 #include <linux/rpmsg.h>
 #include <linux/rpmsg.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
+#include <linux/of_device.h>
 
 
 /**
 /**
  * struct virtproc_info - virtual remote processor state
  * struct virtproc_info - virtual remote processor state
@@ -175,11 +176,12 @@ static int rpmsg_dev_match(struct device *dev, struct device_driver *drv)
 	const struct rpmsg_device_id *ids = rpdrv->id_table;
 	const struct rpmsg_device_id *ids = rpdrv->id_table;
 	unsigned int i;
 	unsigned int i;
 
 
-	for (i = 0; ids[i].name[0]; i++)
-		if (rpmsg_id_match(rpdev, &ids[i]))
-			return 1;
+	if (ids)
+		for (i = 0; ids[i].name[0]; i++)
+			if (rpmsg_id_match(rpdev, &ids[i]))
+				return 1;
 
 
-	return 0;
+	return of_driver_match_device(dev, drv);
 }
 }
 
 
 static int rpmsg_uevent(struct device *dev, struct kobj_uevent_env *env)
 static int rpmsg_uevent(struct device *dev, struct kobj_uevent_env *env)