diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-09-01 15:27:53 -0700 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-09-08 22:02:40 -0700 |
| commit | a16644cb3a96323074d3e71b5d600066d6397c5a (patch) | |
| tree | 20c70dfbcdd6d527ec37c6d2f37f0840b38fc620 /drivers/rpmsg | |
| parent | 4851b1b207d63599d14bd1d316423cd054d90860 (diff) | |
| download | linux-0-day-a16644cb3a96323074d3e71b5d600066d6397c5a.tar.gz linux-0-day-a16644cb3a96323074d3e71b5d600066d6397c5a.tar.xz | |
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>
Diffstat (limited to 'drivers/rpmsg')
| -rw-r--r-- | drivers/rpmsg/virtio_rpmsg_bus.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 4a4374cc6a59b..495fa0a282d36 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -33,6 +33,7 @@ #include <linux/wait.h> #include <linux/rpmsg.h> #include <linux/mutex.h> +#include <linux/of_device.h> /** * 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; 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) |