hwmon: (ucd9000) Add OF device ID table

The driver doesn't have a struct of_device_id table but supported devices
are registered via Device Trees. This is working on the assumption that a
I2C device registered via OF will always match a legacy I2C device ID and
that the MODALIAS reported will always be of the form i2c:<device>.

But this could change in the future so the correct approach is to have an
OF device ID table if the devices are registered via OF.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index 3e3aa950277f4340ee12451d764838a1341671c4..3518f0c0893447d07b18d1aeb0e21839bb6a954d 100644 (file)
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -21,6 +21,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/slab.h>
@@ -119,6 +120,35 @@ static const struct i2c_device_id ucd9000_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ucd9000_id);
 
+static const struct of_device_id ucd9000_of_match[] = {
+       {
+               .compatible = "ti,ucd9000",
+               .data = (void *)ucd9000
+       },
+       {
+               .compatible = "ti,ucd90120",
+               .data = (void *)ucd90120
+       },
+       {
+               .compatible = "ti,ucd90124",
+               .data = (void *)ucd90124
+       },
+       {
+               .compatible = "ti,ucd90160",
+               .data = (void *)ucd90160
+       },
+       {
+               .compatible = "ti,ucd9090",
+               .data = (void *)ucd9090
+       },
+       {
+               .compatible = "ti,ucd90910",
+               .data = (void *)ucd90910
+       },
+       { },
+};
+MODULE_DEVICE_TABLE(of, ucd9000_of_match);
+
 static int ucd9000_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
@@ -126,6 +156,7 @@ static int ucd9000_probe(struct i2c_client *client,
        struct ucd9000_data *data;
        struct pmbus_driver_info *info;
        const struct i2c_device_id *mid;
+       enum chips chip;
        int i, ret;
 
        if (!i2c_check_functionality(client->adapter,
@@ -151,7 +182,12 @@ static int ucd9000_probe(struct i2c_client *client,
                return -ENODEV;
        }
 
-       if (id->driver_data != ucd9000 && id->driver_data != mid->driver_data)
+       if (client->dev.of_node)
+               chip = (enum chips)of_device_get_match_data(&client->dev);
+       else
+               chip = id->driver_data;
+
+       if (chip != ucd9000 && chip != mid->driver_data)
                dev_notice(&client->dev,
                           "Device mismatch: Configured %s, detected %s\n",
                           id->name, mid->name);
@@ -234,6 +270,7 @@ static int ucd9000_probe(struct i2c_client *client,
 static struct i2c_driver ucd9000_driver = {
        .driver = {
                .name = "ucd9000",
+               .of_match_table = of_match_ptr(ucd9000_of_match),
        },
        .probe = ucd9000_probe,
        .remove = pmbus_do_remove,