hwmon: (ads1015) Add OF device ID table (a140986f) · Commits · 戴 / test

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>

drivers/hwmon/ads1015.c

+21 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <linux/hwmon-sysfs.h>
		#include <linux/err.h>
		#include <linux/mutex.h>
		#include <linux/of_device.h>
		#include <linux/of.h>

		#include <linux/i2c/ads1015.h>
		@@ -268,6 +269,11 @@ static int ads1015_probe(struct i2c_client *client,
		GFP_KERNEL);
		if (!data)
		return -ENOMEM;

		if (client->dev.of_node)
		data->id = (enum ads1015_chips)
		of_device_get_match_data(&client->dev);
		else
		data->id = id->driver_data;
		i2c_set_clientdata(client, data);
		mutex_init(&data->update_lock);
		@@ -303,9 +309,23 @@ static const struct i2c_device_id ads1015_id[] = {
		};
		MODULE_DEVICE_TABLE(i2c, ads1015_id);

		static const struct of_device_id ads1015_of_match[] = {
		{
		.compatible = "ti,ads1015",
		.data = (void *)ads1015
		},
		{
		.compatible = "ti,ads1115",
		.data = (void *)ads1115
		},
		{ },
		};
		MODULE_DEVICE_TABLE(of, ads1015_of_match);

		static struct i2c_driver ads1015_driver = {
		.driver = {
		.name = "ads1015",
		.of_match_table = of_match_ptr(ads1015_of_match),
		},
		.probe = ads1015_probe,
		.remove = ads1015_remove,

Admin message