hwmon: (ads7828) 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/ads7828.c b/drivers/hwmon/ads7828.c
index ee396ff167d9d1c2070eeb254475d53dbe4a3f0a..b0ef66687816b3084b1b41c70965afc59a3a28a1 100644 (file)
--- a/drivers/hwmon/ads7828.c
+++ b/drivers/hwmon/ads7828.c
@@ -31,6 +31,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/platform_data/ads7828.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
@@ -121,6 +122,7 @@ static int ads7828_probe(struct i2c_client *client,
        bool diff_input = false;
        bool ext_vref = false;
        unsigned int regval;
+       enum ads7828_chips chip;
 
        data = devm_kzalloc(dev, sizeof(struct ads7828_data), GFP_KERNEL);
        if (!data)
@@ -133,12 +135,18 @@ static int ads7828_probe(struct i2c_client *client,
                        vref_mv = pdata->vref_mv;
        }
 
+       if (client->dev.of_node)
+               chip = (enum ads7828_chips)
+                       of_device_get_match_data(&client->dev);
+       else
+               chip = id->driver_data;
+
        /* Bound Vref with min/max values */
        vref_mv = clamp_val(vref_mv, ADS7828_EXT_VREF_MV_MIN,
                            ADS7828_EXT_VREF_MV_MAX);
 
        /* ADS7828 uses 12-bit samples, while ADS7830 is 8-bit */
-       if (id->driver_data == ads7828) {
+       if (chip == ads7828) {
                data->lsb_resol = DIV_ROUND_CLOSEST(vref_mv * 1000, 4096);
                data->regmap = devm_regmap_init_i2c(client,
                                                    &ads2828_regmap_config);
@@ -177,9 +185,23 @@ static const struct i2c_device_id ads7828_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ads7828_device_ids);
 
+static const struct of_device_id ads7828_of_match[] = {
+       {
+               .compatible = "ti,ads7828",
+               .data = (void *)ads7828
+       },
+       {
+               .compatible = "ti,ads7830",
+               .data = (void *)ads7830
+       },
+       { },
+};
+MODULE_DEVICE_TABLE(of, ads7828_of_match);
+
 static struct i2c_driver ads7828_driver = {
        .driver = {
                .name = "ads7828",
+               .of_match_table = of_match_ptr(ads7828_of_match),
        },
 
        .id_table = ads7828_device_ids,