hwmon: (ucd9200) 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/ucd9200.c b/drivers/hwmon/pmbus/ucd9200.c
index 033d6aca47d3c2d7194ec9e935bfaa135f7778db..a8712c5ded4e939843f0e1626525bfc6cee78627 100644 (file)
--- a/drivers/hwmon/pmbus/ucd9200.c
+++ b/drivers/hwmon/pmbus/ucd9200.c
@@ -20,6 +20,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>
@@ -46,12 +47,50 @@ static const struct i2c_device_id ucd9200_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ucd9200_id);
 
+static const struct of_device_id ucd9200_of_match[] = {
+       {
+               .compatible = "ti,cd9200",
+               .data = (void *)ucd9200
+       },
+       {
+               .compatible = "ti,cd9220",
+               .data = (void *)ucd9220
+       },
+       {
+               .compatible = "ti,cd9222",
+               .data = (void *)ucd9222
+       },
+       {
+               .compatible = "ti,cd9224",
+               .data = (void *)ucd9224
+       },
+       {
+               .compatible = "ti,cd9240",
+               .data = (void *)ucd9240
+       },
+       {
+               .compatible = "ti,cd9244",
+               .data = (void *)ucd9244
+       },
+       {
+               .compatible = "ti,cd9246",
+               .data = (void *)ucd9246
+       },
+       {
+               .compatible = "ti,cd9248",
+               .data = (void *)ucd9248
+       },
+       { },
+};
+MODULE_DEVICE_TABLE(of, ucd9200_of_match);
+
 static int ucd9200_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
        u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1];
        struct pmbus_driver_info *info;
        const struct i2c_device_id *mid;
+       enum chips chip;
        int i, j, ret;
 
        if (!i2c_check_functionality(client->adapter,
@@ -76,7 +115,13 @@ static int ucd9200_probe(struct i2c_client *client,
                dev_err(&client->dev, "Unsupported device\n");
                return -ENODEV;
        }
-       if (id->driver_data != ucd9200 && 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 != ucd9200 && chip != mid->driver_data)
                dev_notice(&client->dev,
                           "Device mismatch: Configured %s, detected %s\n",
                           id->name, mid->name);
@@ -167,6 +212,7 @@ static int ucd9200_probe(struct i2c_client *client,
 static struct i2c_driver ucd9200_driver = {
        .driver = {
                .name = "ucd9200",
+               .of_match_table = of_match_ptr(ucd9200_of_match),
        },
        .probe = ucd9200_probe,
        .remove = pmbus_do_remove,