From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
linux-hwmon@vger.kernel.org, Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 07/19] hwmon: (ina2xx) Add OF device ID table
Date: Fri, 24 Feb 2017 10:13:00 -0300 [thread overview]
Message-ID: <20170224131313.953-8-javier@osg.samsung.com> (raw)
In-Reply-To: <20170224131313.953-1-javier@osg.samsung.com>
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
next prev parent reply other threads:[~2017-02-24 13:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 13:12 [PATCH 00/19] hwmon: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
2017-02-24 13:12 ` [PATCH 01/19] hwmon: (ad7414) Add OF device ID table Javier Martinez Canillas
2017-02-24 13:12 ` [PATCH 02/19] hwmon: (adc128d818) " Javier Martinez Canillas
2017-02-24 13:12 ` [PATCH 03/19] hwmon: (ads1015) " Javier Martinez Canillas
2017-02-24 13:12 ` [PATCH 04/19] hwmon: (ads7828) " Javier Martinez Canillas
2017-02-24 13:12 ` [PATCH 05/19] hwmon: (adt7475) " Javier Martinez Canillas
2017-02-24 13:12 ` [PATCH 06/19] hwmon: (ina209) " Javier Martinez Canillas
2017-02-24 13:13 ` Javier Martinez Canillas [this message]
2017-02-24 13:13 ` [PATCH 08/19] hwmon: (lm63) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 09/19] hwmon: (lm75) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 10/19] hwmon: (lm85) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 11/19] hwmon: (lm90) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 12/19] hwmon: (lm95245) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 13/19] hwmon: (max6697) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 14/19] hwmon: (ucd9000) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 15/19] hwmon: (ucd9200) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 16/19] hwmon: (stts751) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 17/19] hwmon: (tmp102) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 18/19] hwmon: (tmp103) " Javier Martinez Canillas
2017-02-24 13:13 ` [PATCH 19/19] hwmon: (tmp421) " Javier Martinez Canillas
2017-02-24 17:10 ` [PATCH 00/19] hwmon: Add OF device table to I2C drivers that are missing it Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170224131313.953-8-javier@osg.samsung.com \
--to=javier@osg.samsung.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®