LinuxLists.cc - [PATCH v2 00/17] iio: Add OF device table to I2C drivers that are missing it

2017-03-15 04:45:27

Subject: [PATCH v2 00/17] iio: Add OF device table to I2C drivers that are missing it

Hello,

This series add OF device ID tables to IIO I2C drivers whose devices are
either used in Device Tree source files or are listed in binding docs as
a compatible string.

That's done because the plan is to change the I2C core to report proper OF
modaliases instead of always reporting a MODALIAS=i2c:<foo> regardless if
a device was registered via DT or using the legacy platform data mechanism.

So these patches will make sure that IIO I2C drivers modules will continue
to be autoloaded once the I2C core is changed to report proper OF modalias.

Changes in v2:
- Avoid using of_match_ptr() macro which leads to build warnings when
CONFIG_OF is not enabled (Arnd Bergmann).

Best regards,
Javier

Javier Martinez Canillas (17):
iio: adc: ina2xx: Add OF device ID table
iio: mlx96014: Add OF device ID table
iio: magnetometer: bmc150_magn_i2c: Add OF device ID table
iio: dac: mcp4725: Add OF device ID table
iio: light: us5182d: Add OF device ID table
iio: light: tsl2563: Add OF device ID table
iio: pressure: hp03: Add OF device ID table
iio: imu: inv_mpu6050: Add OF device ID table
iio: accel: bma180: Add OF device ID table
iio: light: apds9960: Add OF device ID table
iio: dac: max5821: Set .of_match_table to OF device ID table
iio: adc: ti-ads1015: Add OF device ID table
iio: magnetometer: mag3110: Add OF device ID table
iio: accel: mma7455_i2c: Add OF device ID table
iio: pressure: mpl3115: Add OF device ID table
iio: accel: mma7660: Add OF device ID table
iio: gyro: itg3200: Add OF device ID table

drivers/iio/accel/bma180.c | 24 +++++++++++++++++--
drivers/iio/accel/mma7455_i2c.c | 8 +++++++
drivers/iio/accel/mma7660.c | 7 ++++++
drivers/iio/adc/ina2xx-adc.c | 34 +++++++++++++++++++++++++-
drivers/iio/adc/ti-ads1015.c | 24 +++++++++++++++++--
drivers/iio/dac/max5821.c | 1 +
drivers/iio/dac/mcp4725.c | 24 +++++++++++++++++--
drivers/iio/gyro/itg3200_core.c | 7 ++++++
drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 38 ++++++++++++++++++++++++++----
drivers/iio/light/apds9960.c | 7 ++++++
drivers/iio/light/tsl2563.c | 10 ++++++++
drivers/iio/light/us5182d.c | 7 ++++++
drivers/iio/magnetometer/bmc150_magn_i2c.c | 9 +++++++
drivers/iio/magnetometer/mag3110.c | 7 ++++++
drivers/iio/pressure/hp03.c | 7 ++++++
drivers/iio/pressure/mpl3115.c | 7 ++++++
drivers/iio/temperature/mlx90614.c | 7 ++++++
17 files changed, 217 insertions(+), 11 deletions(-)

--
2.9.3

2017-03-15 04:45:47

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 04/17] iio: dac: mcp4725: Add OF device ID table

2017-03-15 04:45:49

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 05/17] iio: light: us5182d: Add OF device ID table

2017-03-15 04:45:57

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 07/17] iio: pressure: hp03: Add OF device ID table

2017-03-15 04:46:00

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 09/17] iio: accel: bma180: 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 <[email protected]>
---

drivers/iio/accel/bma180.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 0890934ef66f..e3f97757e72d 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -18,6 +18,7 @@
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
+#include <linux/of_device.h>
#include <linux/of.h>
#include <linux/bitops.h>
#include <linux/slab.h>
@@ -32,7 +33,7 @@
#define BMA180_DRV_NAME "bma180"
#define BMA180_IRQ_NAME "bma180_event"

-enum {
+enum chip_ids {
BMA180,
BMA250,
};
@@ -707,6 +708,7 @@ static int bma180_probe(struct i2c_client *client,
{
struct bma180_data *data;
struct iio_dev *indio_dev;
+ enum chip_ids chip;
int ret;

indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
@@ -716,7 +718,11 @@ static int bma180_probe(struct i2c_client *client,
data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev);
data->client = client;
- data->part_info = &bma180_part_info[id->driver_data];
+ if (client->dev.of_node)
+ chip = (enum chip_ids)of_device_get_match_data(&client->dev);
+ else
+ chip = id->driver_data;
+ data->part_info = &bma180_part_info[chip];

ret = data->part_info->chip_config(data);
if (ret < 0)
@@ -844,10 +850,24 @@ static struct i2c_device_id bma180_ids[] = {

MODULE_DEVICE_TABLE(i2c, bma180_ids);

+static const struct of_device_id bma180_of_match[] = {
+ {
+ .compatible = "bosch,bma180",
+ .data = (void *)BMA180
+ },
+ {
+ .compatible = "bosch,bma250",
+ .data = (void *)BMA250
+ },
+ { }
+};
+MODULE_DEVICE_TABLE(of, bma180_of_match);
+
static struct i2c_driver bma180_driver = {
.driver = {
.name = "bma180",
.pm = BMA180_PM_OPS,
+ .of_match_table = bma180_of_match,
},
.probe = bma180_probe,
.remove = bma180_remove,
--
2.9.3

2017-03-15 04:46:07

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 11/17] iio: dac: max5821: Set .of_match_table to OF device ID table

The driver has a OF device ID table but the struct i2c_driver
.of_match_table field is not set.

Signed-off-by: Javier Martinez Canillas <[email protected]>
---

drivers/iio/dac/max5821.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/iio/dac/max5821.c b/drivers/iio/dac/max5821.c
index 86e9e112f554..193fac3059a3 100644
--- a/drivers/iio/dac/max5821.c
+++ b/drivers/iio/dac/max5821.c
@@ -392,6 +392,7 @@ MODULE_DEVICE_TABLE(of, max5821_of_match);
static struct i2c_driver max5821_driver = {
.driver = {
.name = "max5821",
+ .of_match_table = max5821_of_match,
.pm = MAX5821_PM_OPS,
},
.probe = max5821_probe,
--
2.9.3

2017-03-15 04:46:22

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 12/17] iio: adc: ti-ads1015: 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 <[email protected]>
---

drivers/iio/adc/ti-ads1015.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index 422b314f5a3f..f76d979fb7e8 100644
--- a/drivers/iio/adc/ti-ads1015.c
+++ b/drivers/iio/adc/ti-ads1015.c
@@ -15,6 +15,7 @@
*/

#include <linux/module.h>
+#include <linux/of_device.h>
#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/regmap.h>
@@ -55,7 +56,7 @@
#define ADS1015_DEFAULT_DATA_RATE 4
#define ADS1015_DEFAULT_CHAN 0

-enum {
+enum chip_ids {
ADS1015,
ADS1115,
};
@@ -578,6 +579,7 @@ static int ads1015_probe(struct i2c_client *client,
struct iio_dev *indio_dev;
struct ads1015_data *data;
int ret;
+ enum chip_ids chip;

indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
if (!indio_dev)
@@ -593,7 +595,11 @@ static int ads1015_probe(struct i2c_client *client,
indio_dev->name = ADS1015_DRV_NAME;
indio_dev->modes = INDIO_DIRECT_MODE;

- switch (id->driver_data) {
+ if (client->dev.of_node)
+ chip = (enum chip_ids)of_device_get_match_data(&client->dev);
+ else
+ chip = id->driver_data;
+ switch (chip) {
case ADS1015:
indio_dev->channels = ads1015_channels;
indio_dev->num_channels = ARRAY_SIZE(ads1015_channels);
@@ -698,9 +704,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_DRV_NAME,
+ .of_match_table = ads1015_of_match,
.pm = &ads1015_pm_ops,
},
.probe = ads1015_probe,
--
2.9.3

2017-03-15 04:46:12

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 10/17] iio: light: apds9960: Add OF device ID table

2017-03-15 04:46:26

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 13/17] iio: magnetometer: mag3110: Add OF device ID table

2017-03-15 04:46:34

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 17/17] iio: gyro: itg3200: Add OF device ID table

2017-03-15 04:46:29

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 15/17] iio: pressure: mpl3115: Add OF device ID table

2017-03-15 04:47:06

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 16/17] iio: accel: mma7660: Add OF device ID table

2017-03-15 04:47:26

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 14/17] iio: accel: mma7455_i2c: Add OF device ID table

2017-03-15 04:47:57

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 08/17] iio: imu: inv_mpu6050: 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 <[email protected]>
---

drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 38 +++++++++++++++++++++++++++----
1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
index 2c3f8964a3ea..a8e6330cb906 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
@@ -17,6 +17,7 @@
#include <linux/i2c.h>
#include <linux/iio/iio.h>
#include <linux/module.h>
+#include <linux/of_device.h>
#include "inv_mpu_iio.h"

static const struct regmap_config inv_mpu_regmap_config = {
@@ -69,7 +70,8 @@ static int inv_mpu6050_deselect_bypass(struct i2c_mux_core *muxc, u32 chan_id)
return 0;
}

-static const char *inv_mpu_match_acpi_device(struct device *dev, int *chip_id)
+static const char *inv_mpu_match_acpi_device(struct device *dev,
+ enum inv_devices *chip_id)
{
const struct acpi_device_id *id;

@@ -93,7 +95,8 @@ static int inv_mpu_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct inv_mpu6050_state *st;
- int result, chip_type;
+ int result;
+ enum inv_devices chip_type;
struct regmap *regmap;
const char *name;

@@ -101,8 +104,13 @@ static int inv_mpu_probe(struct i2c_client *client,
I2C_FUNC_SMBUS_I2C_BLOCK))
return -EOPNOTSUPP;

- if (id) {
- chip_type = (int)id->driver_data;
+ if (client->dev.of_node) {
+ chip_type = (enum inv_devices)
+ of_device_get_match_data(&client->dev);
+ name = client->name;
+ } else if (id) {
+ chip_type = (enum inv_devices)
+ id->driver_data;
name = id->name;
} else if (ACPI_HANDLE(&client->dev)) {
name = inv_mpu_match_acpi_device(&client->dev, &chip_type);
@@ -176,6 +184,27 @@ static const struct i2c_device_id inv_mpu_id[] = {

MODULE_DEVICE_TABLE(i2c, inv_mpu_id);

+static const struct of_device_id inv_of_match[] = {
+ {
+ .compatible = "invensense,mpu6050",
+ .data = (void *)INV_MPU6050
+ },
+ {
+ .compatible = "invensense,mpu6500",
+ .data = (void *)INV_MPU6500
+ },
+ {
+ .compatible = "invensense,mpu9150",
+ .data = (void *)INV_MPU9150
+ },
+ {
+ .compatible = "invensense,icm20608",
+ .data = (void *)INV_ICM20608
+ },
+ { }
+};
+MODULE_DEVICE_TABLE(of, inv_of_match);
+
static const struct acpi_device_id inv_acpi_match[] = {
{"INVN6500", INV_MPU6500},
{ },
@@ -188,6 +217,7 @@ static struct i2c_driver inv_mpu_driver = {
.remove = inv_mpu_remove,
.id_table = inv_mpu_id,
.driver = {
+ .of_match_table = inv_of_match,
.acpi_match_table = ACPI_PTR(inv_acpi_match),
.name = "inv-mpu6050-i2c",
.pm = &inv_mpu_pmops,
--
2.9.3

2017-03-15 04:48:36

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 06/17] iio: light: tsl2563: Add OF device ID table

2017-03-15 04:45:44

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 01/17] iio: adc: ina2xx: 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 <[email protected]>
---

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..db9838230257 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 = ina2xx_of_match,
},
.probe = ina2xx_probe,
.remove = ina2xx_remove,
--
2.9.3

2017-03-15 04:45:45

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 03/17] iio: magnetometer: bmc150_magn_i2c: Add OF device ID table

2017-03-15 04:45:43

by Javier Martinez Canillas

[permalink] [raw]

Subject: [PATCH v2 02/17] iio: mlx96014: Add OF device ID table

2017-03-15 10:47:42

by Crt Mori

[permalink] [raw]

Subject: Re: [PATCH v2 02/17] iio: mlx96014: Add OF device ID table

Hi,
Thanks for the patch. If the assumption will not be there than this
fix is needed. I tested it on BeagleBoneBlack and it does not effect
anything.

Tested-by: Crt Mori <[email protected]>
Acked-by: Crt Mori <[email protected]>

Best regards,
Crt

On 15 March 2017 at 05:44, Javier Martinez Canillas
<[email protected]> wrote:
> 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 <[email protected]>
> ---
>
> drivers/iio/temperature/mlx90614.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/iio/temperature/mlx90614.c b/drivers/iio/temperature/mlx90614.c
> index 4b645fc672aa..2077eef4095c 100644
> --- a/drivers/iio/temperature/mlx90614.c
> +++ b/drivers/iio/temperature/mlx90614.c
> @@ -585,6 +585,12 @@ static const struct i2c_device_id mlx90614_id[] = {
> };
> MODULE_DEVICE_TABLE(i2c, mlx90614_id);
>
> +static const struct of_device_id mlx90614_of_match[] = {
> + { .compatible = "melexis,mlx90614" },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, mlx90614_of_match);
> +
> #ifdef CONFIG_PM_SLEEP
> static int mlx90614_pm_suspend(struct device *dev)
> {
> @@ -644,6 +650,7 @@ static const struct dev_pm_ops mlx90614_pm_ops = {
> static struct i2c_driver mlx90614_driver = {
> .driver = {
> .name = "mlx90614",
> + .of_match_table = mlx90614_of_match,
> .pm = &mlx90614_pm_ops,
> },
> .probe = mlx90614_probe,
> --
> 2.9.3
>

2017-03-19 10:48:46

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 01/17] iio: adc: ina2xx: Add OF device ID table

On 15/03/17 04:44, Javier Martinez Canillas wrote:
> 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 <[email protected]>
Applied to the togreg branch of iio.git - initially pushed out as testing for
the autobuilders to play with it.

Thanks for cleaning this up.

Jonathan
> ---
>
> 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..db9838230257 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 = ina2xx_of_match,
> },
> .probe = ina2xx_probe,
> .remove = ina2xx_remove,
>

2017-03-19 10:50:39

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 03/17] iio: magnetometer: bmc150_magn_i2c: Add OF device ID table

2017-03-19 10:50:34

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 02/17] iio: mlx96014: Add OF device ID table

On 15/03/17 10:46, Crt Mori wrote:
> Hi,
> Thanks for the patch. If the assumption will not be there than this
> fix is needed. I tested it on BeagleBoneBlack and it does not effect
> anything.
>
> Tested-by: Crt Mori <[email protected]>
> Acked-by: Crt Mori <[email protected]>
Applied.

Thanks,

Jonathan
>
> Best regards,
> Crt
>
>
> On 15 March 2017 at 05:44, Javier Martinez Canillas
> <[email protected]> wrote:
>> 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 <[email protected]>
>> ---
>>
>> drivers/iio/temperature/mlx90614.c | 7 +++++++
>> 1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/iio/temperature/mlx90614.c b/drivers/iio/temperature/mlx90614.c
>> index 4b645fc672aa..2077eef4095c 100644
>> --- a/drivers/iio/temperature/mlx90614.c
>> +++ b/drivers/iio/temperature/mlx90614.c
>> @@ -585,6 +585,12 @@ static const struct i2c_device_id mlx90614_id[] = {
>> };
>> MODULE_DEVICE_TABLE(i2c, mlx90614_id);
>>
>> +static const struct of_device_id mlx90614_of_match[] = {
>> + { .compatible = "melexis,mlx90614" },
>> + { }
>> +};
>> +MODULE_DEVICE_TABLE(of, mlx90614_of_match);
>> +
>> #ifdef CONFIG_PM_SLEEP
>> static int mlx90614_pm_suspend(struct device *dev)
>> {
>> @@ -644,6 +650,7 @@ static const struct dev_pm_ops mlx90614_pm_ops = {
>> static struct i2c_driver mlx90614_driver = {
>> .driver = {
>> .name = "mlx90614",
>> + .of_match_table = mlx90614_of_match,
>> .pm = &mlx90614_pm_ops,
>> },
>> .probe = mlx90614_probe,
>> --
>> 2.9.3
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

2017-03-19 10:51:31

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 04/17] iio: dac: mcp4725: Add OF device ID table

On 15/03/17 04:44, Javier Martinez Canillas wrote:
> 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 <[email protected]>
Applied.

Thanks,
> ---
>
> drivers/iio/dac/mcp4725.c | 24 ++++++++++++++++++++++--
> 1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
> index db109f0cdd8c..6ab1f23e5a79 100644
> --- a/drivers/iio/dac/mcp4725.c
> +++ b/drivers/iio/dac/mcp4725.c
> @@ -19,6 +19,7 @@
> #include <linux/err.h>
> #include <linux/delay.h>
> #include <linux/regulator/consumer.h>
> +#include <linux/of_device.h>
> #include <linux/of.h>
>
> #include <linux/iio/iio.h>
> @@ -199,7 +200,7 @@ static ssize_t mcp4725_write_powerdown(struct iio_dev *indio_dev,
> return len;
> }
>
> -enum {
> +enum chip_id {
> MCP4725,
> MCP4726,
> };
> @@ -406,7 +407,10 @@ static int mcp4725_probe(struct i2c_client *client,
> data = iio_priv(indio_dev);
> i2c_set_clientdata(client, indio_dev);
> data->client = client;
> - data->id = id->driver_data;
> + if (client->dev.of_node)
> + data->id = (enum chip_id)of_device_get_match_data(&client->dev);
> + else
> + data->id = id->driver_data;
> pdata = dev_get_platdata(&client->dev);
>
> if (!pdata) {
> @@ -525,9 +529,25 @@ static const struct i2c_device_id mcp4725_id[] = {
> };
> MODULE_DEVICE_TABLE(i2c, mcp4725_id);
>
> +#ifdef CONFIG_OF
> +static const struct of_device_id mcp4725_of_match[] = {
> + {
> + .compatible = "microchip,mcp4725",
> + .data = (void *)MCP4725
> + },
> + {
> + .compatible = "microchip,mcp4726",
> + .data = (void *)MCP4726
> + },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, mcp4725_of_match);
> +#endif
> +
> static struct i2c_driver mcp4725_driver = {
> .driver = {
> .name = MCP4725_DRV_NAME,
> + .of_match_table = of_match_ptr(mcp4725_of_match),
> .pm = MCP4725_PM_OPS,
> },
> .probe = mcp4725_probe,
>

2017-03-19 10:52:41

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 05/17] iio: light: us5182d: Add OF device ID table

2017-03-19 10:53:23

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 06/17] iio: light: tsl2563: Add OF device ID table

2017-03-19 10:53:52

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 07/17] iio: pressure: hp03: Add OF device ID table

2017-03-19 10:57:31

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 11/17] iio: dac: max5821: Set .of_match_table to OF device ID table

On 15/03/17 04:44, Javier Martinez Canillas wrote:
> The driver has a OF device ID table but the struct i2c_driver
> .of_match_table field is not set.
>
> Signed-off-by: Javier Martinez Canillas <[email protected]>
applied.
> ---
>
> drivers/iio/dac/max5821.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/iio/dac/max5821.c b/drivers/iio/dac/max5821.c
> index 86e9e112f554..193fac3059a3 100644
> --- a/drivers/iio/dac/max5821.c
> +++ b/drivers/iio/dac/max5821.c
> @@ -392,6 +392,7 @@ MODULE_DEVICE_TABLE(of, max5821_of_match);
> static struct i2c_driver max5821_driver = {
> .driver = {
> .name = "max5821",
> + .of_match_table = max5821_of_match,
> .pm = MAX5821_PM_OPS,
> },
> .probe = max5821_probe,
>

2017-03-19 10:57:43

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 13/17] iio: magnetometer: mag3110: Add OF device ID table

2017-03-19 10:57:34

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 12/17] iio: adc: ti-ads1015: Add OF device ID table

On 15/03/17 04:45, Javier Martinez Canillas wrote:
> 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 <[email protected]>
Applied.
> ---
>
> drivers/iio/adc/ti-ads1015.c | 24 ++++++++++++++++++++++--
> 1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
> index 422b314f5a3f..f76d979fb7e8 100644
> --- a/drivers/iio/adc/ti-ads1015.c
> +++ b/drivers/iio/adc/ti-ads1015.c
> @@ -15,6 +15,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/of_device.h>
> #include <linux/init.h>
> #include <linux/i2c.h>
> #include <linux/regmap.h>
> @@ -55,7 +56,7 @@
> #define ADS1015_DEFAULT_DATA_RATE 4
> #define ADS1015_DEFAULT_CHAN 0
>
> -enum {
> +enum chip_ids {
> ADS1015,
> ADS1115,
> };
> @@ -578,6 +579,7 @@ static int ads1015_probe(struct i2c_client *client,
> struct iio_dev *indio_dev;
> struct ads1015_data *data;
> int ret;
> + enum chip_ids chip;
>
> indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
> if (!indio_dev)
> @@ -593,7 +595,11 @@ static int ads1015_probe(struct i2c_client *client,
> indio_dev->name = ADS1015_DRV_NAME;
> indio_dev->modes = INDIO_DIRECT_MODE;
>
> - switch (id->driver_data) {
> + if (client->dev.of_node)
> + chip = (enum chip_ids)of_device_get_match_data(&client->dev);
> + else
> + chip = id->driver_data;
> + switch (chip) {
> case ADS1015:
> indio_dev->channels = ads1015_channels;
> indio_dev->num_channels = ARRAY_SIZE(ads1015_channels);
> @@ -698,9 +704,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_DRV_NAME,
> + .of_match_table = ads1015_of_match,
> .pm = &ads1015_pm_ops,
> },
> .probe = ads1015_probe,
>

2017-03-19 10:58:04

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 14/17] iio: accel: mma7455_i2c: Add OF device ID table

2017-03-19 10:58:21

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 15/17] iio: pressure: mpl3115: Add OF device ID table

2017-03-19 10:57:26

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 09/17] iio: accel: bma180: Add OF device ID table

On 15/03/17 04:44, Javier Martinez Canillas wrote:
> 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 <[email protected]>
Applied.
> ---
>
> drivers/iio/accel/bma180.c | 24 ++++++++++++++++++++++--
> 1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
> index 0890934ef66f..e3f97757e72d 100644
> --- a/drivers/iio/accel/bma180.c
> +++ b/drivers/iio/accel/bma180.c
> @@ -18,6 +18,7 @@
> #include <linux/i2c.h>
> #include <linux/interrupt.h>
> #include <linux/delay.h>
> +#include <linux/of_device.h>
> #include <linux/of.h>
> #include <linux/bitops.h>
> #include <linux/slab.h>
> @@ -32,7 +33,7 @@
> #define BMA180_DRV_NAME "bma180"
> #define BMA180_IRQ_NAME "bma180_event"
>
> -enum {
> +enum chip_ids {
> BMA180,
> BMA250,
> };
> @@ -707,6 +708,7 @@ static int bma180_probe(struct i2c_client *client,
> {
> struct bma180_data *data;
> struct iio_dev *indio_dev;
> + enum chip_ids chip;
> int ret;
>
> indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
> @@ -716,7 +718,11 @@ static int bma180_probe(struct i2c_client *client,
> data = iio_priv(indio_dev);
> i2c_set_clientdata(client, indio_dev);
> data->client = client;
> - data->part_info = &bma180_part_info[id->driver_data];
> + if (client->dev.of_node)
> + chip = (enum chip_ids)of_device_get_match_data(&client->dev);
> + else
> + chip = id->driver_data;
> + data->part_info = &bma180_part_info[chip];
>
> ret = data->part_info->chip_config(data);
> if (ret < 0)
> @@ -844,10 +850,24 @@ static struct i2c_device_id bma180_ids[] = {
>
> MODULE_DEVICE_TABLE(i2c, bma180_ids);
>
> +static const struct of_device_id bma180_of_match[] = {
> + {
> + .compatible = "bosch,bma180",
> + .data = (void *)BMA180
> + },
> + {
> + .compatible = "bosch,bma250",
> + .data = (void *)BMA250
> + },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, bma180_of_match);
> +
> static struct i2c_driver bma180_driver = {
> .driver = {
> .name = "bma180",
> .pm = BMA180_PM_OPS,
> + .of_match_table = bma180_of_match,
> },
> .probe = bma180_probe,
> .remove = bma180_remove,
>

2017-03-19 10:58:50

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 16/17] iio: accel: mma7660: Add OF device ID table

2017-03-19 10:59:55

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 17/17] iio: gyro: itg3200: Add OF device ID table

2017-03-19 11:03:17

by Jonathan Cameron

[permalink] [raw]

Subject: Re: [PATCH v2 08/17] iio: imu: inv_mpu6050: Add OF device ID table

On 15/03/17 04:44, Javier Martinez Canillas wrote:
> 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 <[email protected]>
Applied.
> ---
>
> drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 38 +++++++++++++++++++++++++++----
> 1 file changed, 34 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
> index 2c3f8964a3ea..a8e6330cb906 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
> @@ -17,6 +17,7 @@
> #include <linux/i2c.h>
> #include <linux/iio/iio.h>
> #include <linux/module.h>
> +#include <linux/of_device.h>
> #include "inv_mpu_iio.h"
>
> static const struct regmap_config inv_mpu_regmap_config = {
> @@ -69,7 +70,8 @@ static int inv_mpu6050_deselect_bypass(struct i2c_mux_core *muxc, u32 chan_id)
> return 0;
> }
>
> -static const char *inv_mpu_match_acpi_device(struct device *dev, int *chip_id)
> +static const char *inv_mpu_match_acpi_device(struct device *dev,
> + enum inv_devices *chip_id)
> {
> const struct acpi_device_id *id;
>
> @@ -93,7 +95,8 @@ static int inv_mpu_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> struct inv_mpu6050_state *st;
> - int result, chip_type;
> + int result;
> + enum inv_devices chip_type;
> struct regmap *regmap;
> const char *name;
>
> @@ -101,8 +104,13 @@ static int inv_mpu_probe(struct i2c_client *client,
> I2C_FUNC_SMBUS_I2C_BLOCK))
> return -EOPNOTSUPP;
>
> - if (id) {
> - chip_type = (int)id->driver_data;
> + if (client->dev.of_node) {
> + chip_type = (enum inv_devices)
> + of_device_get_match_data(&client->dev);
> + name = client->name;
> + } else if (id) {
> + chip_type = (enum inv_devices)
> + id->driver_data;
> name = id->name;
> } else if (ACPI_HANDLE(&client->dev)) {
> name = inv_mpu_match_acpi_device(&client->dev, &chip_type);
> @@ -176,6 +184,27 @@ static const struct i2c_device_id inv_mpu_id[] = {
>
> MODULE_DEVICE_TABLE(i2c, inv_mpu_id);
>
> +static const struct of_device_id inv_of_match[] = {
> + {
> + .compatible = "invensense,mpu6050",
> + .data = (void *)INV_MPU6050
> + },
> + {
> + .compatible = "invensense,mpu6500",
> + .data = (void *)INV_MPU6500
> + },
> + {
> + .compatible = "invensense,mpu9150",
> + .data = (void *)INV_MPU9150
> + },
> + {
> + .compatible = "invensense,icm20608",
> + .data = (void *)INV_ICM20608
> + },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, inv_of_match);
> +
> static const struct acpi_device_id inv_acpi_match[] = {
> {"INVN6500", INV_MPU6500},
> { },
> @@ -188,6 +217,7 @@ static struct i2c_driver inv_mpu_driver = {
> .remove = inv_mpu_remove,
> .id_table = inv_mpu_id,
> .driver = {
> + .of_match_table = inv_of_match,
> .acpi_match_table = ACPI_PTR(inv_acpi_match),
> .name = "inv-mpu6050-i2c",
> .pm = &inv_mpu_pmops,
>

2017-03-19 11:03:16

by Jonathan Cameron

[permalink] [raw]

Subject: [PATCH v2 00/17] iio: Add OF device table to I2C drivers that are missing it

Subject: [PATCH v2 04/17] iio: dac: mcp4725: Add OF device ID table

Subject: [PATCH v2 05/17] iio: light: us5182d: Add OF device ID table

Subject: [PATCH v2 07/17] iio: pressure: hp03: Add OF device ID table

Subject: [PATCH v2 09/17] iio: accel: bma180: Add OF device ID table

Subject: [PATCH v2 11/17] iio: dac: max5821: Set .of_match_table to OF device ID table

Subject: [PATCH v2 12/17] iio: adc: ti-ads1015: Add OF device ID table

Subject: [PATCH v2 10/17] iio: light: apds9960: Add OF device ID table

Subject: [PATCH v2 13/17] iio: magnetometer: mag3110: Add OF device ID table

Subject: [PATCH v2 17/17] iio: gyro: itg3200: Add OF device ID table

Subject: [PATCH v2 15/17] iio: pressure: mpl3115: Add OF device ID table

Subject: [PATCH v2 16/17] iio: accel: mma7660: Add OF device ID table

Subject: [PATCH v2 14/17] iio: accel: mma7455_i2c: Add OF device ID table

Subject: [PATCH v2 08/17] iio: imu: inv_mpu6050: Add OF device ID table

Subject: [PATCH v2 06/17] iio: light: tsl2563: Add OF device ID table

Subject: [PATCH v2 01/17] iio: adc: ina2xx: Add OF device ID table

Subject: [PATCH v2 03/17] iio: magnetometer: bmc150_magn_i2c: Add OF device ID table

Subject: [PATCH v2 02/17] iio: mlx96014: Add OF device ID table

Subject: Re: [PATCH v2 02/17] iio: mlx96014: Add OF device ID table

Subject: Re: [PATCH v2 01/17] iio: adc: ina2xx: Add OF device ID table

Subject: Re: [PATCH v2 03/17] iio: magnetometer: bmc150_magn_i2c: Add OF device ID table

Subject: Re: [PATCH v2 02/17] iio: mlx96014: Add OF device ID table

Subject: Re: [PATCH v2 04/17] iio: dac: mcp4725: Add OF device ID table

Subject: Re: [PATCH v2 05/17] iio: light: us5182d: Add OF device ID table

Subject: Re: [PATCH v2 06/17] iio: light: tsl2563: Add OF device ID table

Subject: Re: [PATCH v2 07/17] iio: pressure: hp03: Add OF device ID table

Subject: Re: [PATCH v2 11/17] iio: dac: max5821: Set .of_match_table to OF device ID table

Subject: Re: [PATCH v2 13/17] iio: magnetometer: mag3110: Add OF device ID table

Subject: Re: [PATCH v2 12/17] iio: adc: ti-ads1015: Add OF device ID table

Subject: Re: [PATCH v2 14/17] iio: accel: mma7455_i2c: Add OF device ID table

Subject: Re: [PATCH v2 15/17] iio: pressure: mpl3115: Add OF device ID table

Subject: Re: [PATCH v2 09/17] iio: accel: bma180: Add OF device ID table

Subject: Re: [PATCH v2 16/17] iio: accel: mma7660: Add OF device ID table

Subject: Re: [PATCH v2 17/17] iio: gyro: itg3200: Add OF device ID table

Subject: Re: [PATCH v2 08/17] iio: imu: inv_mpu6050: Add OF device ID table

Subject: Re: [PATCH v2 10/17] iio: light: apds9960: Add OF device ID table