2 files changed, 28 insertions, 0 deletions

diff --git a/drivers/rapidio/rio-driver.c b/drivers/rapidio/rio-driver.c
index a0c875563d76..3e9b6a78ad18 100644
--- a/drivers/rapidio/rio-driver.c
+++ b/drivers/rapidio/rio-driver.c
@@ -199,6 +199,23 @@ static int rio_match_bus(struct device *dev, struct device_driver *drv)
       out:return 0;
 }
 
+static int rio_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct rio_dev *rdev;
+
+        if (!dev)
+                return -ENODEV;
+
+        rdev = to_rio_dev(dev);
+        if (!rdev)
+                return -ENODEV;
+
+        if (add_uevent_var(env, "MODALIAS=rapidio:v%04Xd%04Xav%04Xad%04X",
+                           rdev->vid, rdev->did, rdev->asm_vid, rdev->asm_did))
+                return -ENOMEM;
+        return 0;
+}
+
 struct device rio_bus = {
         .init_name = "rapidio",
 };
@@ -210,6 +227,7 @@ struct bus_type rio_bus_type = {
         .bus_attrs = rio_bus_attrs,
         .probe = rio_device_probe,
         .remove = rio_device_remove,
+        .uevent = rio_uevent,
 };
 
 /**
diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 0c4473e54f86..9331be646dc3 100644
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -84,6 +84,15 @@ static ssize_t lnext_show(struct device *dev,
         return str - buf;
 }
 
+static ssize_t modalias_show(struct device *dev,
+                             struct device_attribute *attr, char *buf)
+{
+        struct rio_dev *rdev = to_rio_dev(dev);
+
+        return sprintf(buf, "rapidio:v%04Xd%04Xav%04Xad%04X\n",
+                       rdev->vid, rdev->did, rdev->asm_vid, rdev->asm_did);
+}
+
 struct device_attribute rio_dev_attrs[] = {
         __ATTR_RO(did),
         __ATTR_RO(vid),
@@ -93,6 +102,7 @@ struct device_attribute rio_dev_attrs[] = {
         __ATTR_RO(asm_rev),
         __ATTR_RO(lprev),
         __ATTR_RO(destid),
+        __ATTR_RO(modalias),
         __ATTR_NULL,
 };