Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1587638

[PATCH 07/19] hwmon: (ina2xx) Add OF device ID table

Show all headers | View raw

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>
---

 drivers/hwmon/ina2xx.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index b24f1d3045f0..62e38fa8cda2 100644
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -34,6 +34,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/jiffies.h>
+#include <linux/of_device.h>
 #include <linux/of.h>
 #include <linux/delay.h>
 #include <linux/util_macros.h>
@@ -424,13 +425,19 @@ static int ina2xx_probe(struct i2c_client *client,
 	struct device *hwmon_dev;
 	u32 val;
 	int ret, group = 0;
+	enum ina2xx_ids chip;
+
+	if (client->dev.of_node)
+		chip = (enum ina2xx_ids)of_device_get_match_data(&client->dev);
+	else
+		chip = id->driver_data;
 
 	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
 	if (!data)
 		return -ENOMEM;
 
 	/* set the device type */
-	data->config = &ina2xx_config[id->driver_data];
+	data->config = &ina2xx_config[chip];
 
 	if (of_property_read_u32(dev->of_node, "shunt-resistor", &val) < 0) {
 		struct ina2xx_platform_data *pdata = dev_get_platdata(dev);
@@ -487,9 +494,35 @@ static const struct i2c_device_id ina2xx_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ina2xx_id);
 
+static const struct of_device_id ina2xx_of_match[] = {
+	{
+		.compatible = "ti,ina219",
+		.data = (void *)ina219
+	},
+	{
+		.compatible = "ti,ina220",
+		.data = (void *)ina219
+	},
+	{
+		.compatible = "ti,ina226",
+		.data = (void *)ina226
+	},
+	{
+		.compatible = "ti,ina230",
+		.data = (void *)ina226
+	},
+	{
+		.compatible = "ti,ina231",
+		.data = (void *)ina226
+	},
+	{ },
+};
+MODULE_DEVICE_TABLE(of, ina2xx_of_match);
+
 static struct i2c_driver ina2xx_driver = {
 	.driver = {
 		.name	= "ina2xx",
+		.of_match_table = of_match_ptr(ina2xx_of_match),
 	},
 	.probe		= ina2xx_probe,
 	.id_table	= ina2xx_id,
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/19] hwmon: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:20 +0100
  [PATCH 07/19] hwmon: (ina2xx) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:20 +0100
  [PATCH 03/19] hwmon: (ads1015) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:20 +0100
  [PATCH 16/19] hwmon: (stts751) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:20 +0100
  [PATCH 19/19] hwmon: (tmp421) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:20 +0100
  [PATCH 12/19] hwmon: (lm95245) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:20 +0100
  [PATCH 08/19] hwmon: (lm63) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:20 +0100
  [PATCH 04/19] hwmon: (ads7828) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:30 +0100
  [PATCH 15/19] hwmon: (ucd9200) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:30 +0100
  [PATCH 02/19] hwmon: (adc128d818) Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-02-24 14:30 +0100
  Re: [PATCH 00/19] hwmon: Add OF device table to I2C drivers that are  missing it Guenter Roeck <linux@roeck-us.net> - 2017-02-24 18:20 +0100

csiph-web