Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1599753
| From | Javier Martinez Canillas <javier@osg.samsung.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 01/17] iio: adc: ina2xx: Add OF device ID table |
| Date | 2017-03-13 21:10 +0100 |
| Message-ID | <tkEs2-5H9-27@gated-at.bofh.it> (permalink) |
| References | <tkEin-5lT-35@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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/iio/adc/ina2xx-adc.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c
index 3263231276ca..9affc8e95f1d 100644
--- a/drivers/iio/adc/ina2xx-adc.c
+++ b/drivers/iio/adc/ina2xx-adc.c
@@ -28,6 +28,7 @@
#include <linux/iio/sysfs.h>
#include <linux/kthread.h>
#include <linux/module.h>
+#include <linux/of_device.h>
#include <linux/regmap.h>
#include <linux/util_macros.h>
@@ -635,6 +636,7 @@ static int ina2xx_probe(struct i2c_client *client,
struct iio_dev *indio_dev;
struct iio_buffer *buffer;
unsigned int val;
+ enum ina2xx_ids type;
int ret;
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
@@ -652,7 +654,11 @@ static int ina2xx_probe(struct i2c_client *client,
return PTR_ERR(chip->regmap);
}
- chip->config = &ina2xx_config[id->driver_data];
+ if (client->dev.of_node)
+ type = (enum ina2xx_ids)of_device_get_match_data(&client->dev);
+ else
+ type = id->driver_data;
+ chip->config = &ina2xx_config[type];
mutex_init(&chip->state_lock);
@@ -726,9 +732,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 = KBUILD_MODNAME,
+ .of_match_table = of_match_ptr(ina2xx_of_match),
},
.probe = ina2xx_probe,
.remove = ina2xx_remove,
--
2.9.3
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/17] iio: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:00 +0100 [PATCH 07/17] iio: pressure: hp03: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 14/17] iio: accel: mma7455_i2c: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 01/17] iio: adc: ina2xx: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 03/17] iio: magnetometer: bmc150_magn_i2c: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 16/17] iio: accel: mma7660: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 12/17] iio: adc: ti-ads1015: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 13/17] iio: magnetometer: mag3110: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 06/17] iio: light: tsl2563: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 15/17] iio: pressure: mpl3115: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 17/17] iio: gyro: itg3200: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 10/17] iio: light: apds9960: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 02/17] iio: mlx96014: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 09/17] iio: accel: bma180: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 11/17] iio: dac: max5821: Set .of_match_table to OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 05/17] iio: light: us5182d: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 04/17] iio: dac: mcp4725: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100 [PATCH 08/17] iio: imu: inv_mpu6050: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-13 21:10 +0100
csiph-web