|
 |
69f65af |
From patchwork Wed Jun 28 21:53:23 2017
|
|
|
69f65af |
Content-Type: text/plain; charset="utf-8"
|
|
|
69f65af |
MIME-Version: 1.0
|
|
|
69f65af |
Content-Transfer-Encoding: 7bit
|
|
|
69f65af |
Subject: [v2] rpmsg: Make modalias work for DeviceTree based devices
|
|
|
69f65af |
From: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
|
69f65af |
X-Patchwork-Id: 9815555
|
|
|
69f65af |
Message-Id: <20170628215323.5658-1-bjorn.andersson@linaro.org>
|
|
|
69f65af |
To: Ohad Ben-Cohen <ohad@wizery.com>,
|
|
|
69f65af |
Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
|
69f65af |
Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
|
|
|
69f65af |
Rob Clark <robdclark@gmail.com>
|
|
|
69f65af |
Date: Wed, 28 Jun 2017 14:53:23 -0700
|
|
|
69f65af |
|
|
|
69f65af |
When rpmsg devices are expected to be matched based on their compatible
|
|
|
69f65af |
the modalias should reflect this, so that module autoloading has a
|
|
|
69f65af |
chance to match and load the appropriate module.
|
|
|
69f65af |
|
|
|
69f65af |
Tested-by: Rob Clark <robdclark@gmail.com>
|
|
|
69f65af |
Reported-by: Rob Clark <robdclark@gmail.com>
|
|
|
69f65af |
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
|
69f65af |
---
|
|
|
69f65af |
|
|
|
69f65af |
Changes since v1:
|
|
|
69f65af |
- Also update rpmsg_uevent()
|
|
|
69f65af |
|
|
|
69f65af |
drivers/rpmsg/rpmsg_core.c | 10 ++++++++++
|
|
|
69f65af |
1 file changed, 10 insertions(+)
|
|
|
69f65af |
|
|
|
69f65af |
diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
|
|
|
69f65af |
index ad3d2a9df287..067650c5bcb6 100644
|
|
|
69f65af |
--- a/drivers/rpmsg/rpmsg_core.c
|
|
|
69f65af |
+++ b/drivers/rpmsg/rpmsg_core.c
|
|
|
69f65af |
@@ -343,6 +343,11 @@ static ssize_t modalias_show(struct device *dev,
|
|
|
69f65af |
struct device_attribute *attr, char *buf)
|
|
|
69f65af |
{
|
|
|
69f65af |
struct rpmsg_device *rpdev = to_rpmsg_device(dev);
|
|
|
69f65af |
+ ssize_t len;
|
|
|
69f65af |
+
|
|
|
69f65af |
+ len = of_device_modalias(dev, buf, PAGE_SIZE);
|
|
|
69f65af |
+ if (len != -ENODEV)
|
|
|
69f65af |
+ return len;
|
|
|
69f65af |
|
|
|
69f65af |
return sprintf(buf, RPMSG_DEVICE_MODALIAS_FMT "\n", rpdev->id.name);
|
|
|
69f65af |
}
|
|
|
69f65af |
@@ -387,6 +392,11 @@ static int rpmsg_dev_match(struct device *dev, struct device_driver *drv)
|
|
|
69f65af |
static int rpmsg_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
|
69f65af |
{
|
|
|
69f65af |
struct rpmsg_device *rpdev = to_rpmsg_device(dev);
|
|
|
69f65af |
+ int ret;
|
|
|
69f65af |
+
|
|
|
69f65af |
+ ret = of_device_uevent_modalias(dev, env);
|
|
|
69f65af |
+ if (ret != -ENODEV)
|
|
|
69f65af |
+ return ret;
|
|
|
69f65af |
|
|
|
69f65af |
return add_uevent_var(env, "MODALIAS=" RPMSG_DEVICE_MODALIAS_FMT,
|
|
|
69f65af |
rpdev->id.name);
|
|
|
69f65af |
diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c
|
|
|
69f65af |
index 2b9b0941d9eb..6d23226e5f69 100644
|
|
|
69f65af |
--- a/drivers/spmi/spmi.c
|
|
|
69f65af |
+++ b/drivers/spmi/spmi.c
|
|
|
69f65af |
@@ -365,11 +365,23 @@ static int spmi_drv_remove(struct device *dev)
|
|
|
69f65af |
return 0;
|
|
|
69f65af |
}
|
|
|
69f65af |
|
|
|
69f65af |
+static int spmi_drv_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
|
69f65af |
+{
|
|
|
69f65af |
+ int ret;
|
|
|
69f65af |
+
|
|
|
69f65af |
+ ret = of_device_uevent_modalias(dev, env);
|
|
|
69f65af |
+ if (ret != -ENODEV)
|
|
|
69f65af |
+ return ret;
|
|
|
69f65af |
+
|
|
|
69f65af |
+ return 0;
|
|
|
69f65af |
+}
|
|
|
69f65af |
+
|
|
|
69f65af |
static struct bus_type spmi_bus_type = {
|
|
|
69f65af |
.name = "spmi",
|
|
|
69f65af |
.match = spmi_device_match,
|
|
|
69f65af |
.probe = spmi_drv_probe,
|
|
|
69f65af |
.remove = spmi_drv_remove,
|
|
|
69f65af |
+ .uevent = spmi_drv_uevent,
|
|
|
69f65af |
};
|
|
|
69f65af |
|
|
|
69f65af |
/**
|