6 files changed, 177 insertions, 0 deletions

diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index d7bedbdfc81d..7164aeff3ab1 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -18,6 +18,55 @@
 #include <linux/iio/common/st_sensors_i2c.h>
 #include "st_accel.h"
 
+#ifdef CONFIG_OF
+static const struct of_device_id st_accel_of_match[] = {
+        {
+                .compatible = "st,lsm303dlh-accel",
+                .data = LSM303DLH_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm303dlhc-accel",
+                .data = LSM303DLHC_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lis3dh-accel",
+                .data = LIS3DH_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm330d-accel",
+                .data = LSM330D_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm330dl-accel",
+                .data = LSM330DL_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm330dlc-accel",
+                .data = LSM330DLC_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lis331dlh-accel",
+                .data = LIS331DLH_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm303dl-accel",
+                .data = LSM303DL_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm303dlm-accel",
+                .data = LSM303DLM_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm330-accel",
+                .data = LSM330_ACCEL_DEV_NAME,
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, st_accel_of_match);
+#else
+#define st_accel_of_match NULL
+#endif
+
 static int st_accel_i2c_probe(struct i2c_client *client,
                                                 const struct i2c_device_id *id)
 {
@@ -31,6 +80,7 @@ static int st_accel_i2c_probe(struct i2c_client *client,
 
         adata = iio_priv(indio_dev);
         adata->dev = &client->dev;
+        st_sensors_of_i2c_probe(client, st_accel_of_match);
 
         st_sensors_i2c_configure(indio_dev, client, adata);
 
@@ -67,6 +117,7 @@ static struct i2c_driver st_accel_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "st-accel-i2c",
+                .of_match_table = of_match_ptr(st_accel_of_match),
         },
         .probe = st_accel_i2c_probe,
         .remove = st_accel_i2c_remove,
diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c
index 38af9440c103..bb6f3085f57b 100644
--- a/drivers/iio/common/st_sensors/st_sensors_i2c.c
+++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/iio/iio.h>
+#include <linux/of_device.h>
 
 #include <linux/iio/common/st_sensors_i2c.h>
 
@@ -76,6 +77,35 @@ void st_sensors_i2c_configure(struct iio_dev *indio_dev,
 }
 EXPORT_SYMBOL(st_sensors_i2c_configure);
 
+#ifdef CONFIG_OF
+/**
+ * st_sensors_of_i2c_probe() - device tree probe for ST I2C sensors
+ * @client: the I2C client device for the sensor
+ * @match: the OF match table for the device, containing compatible strings
+ *      but also a .data field with the corresponding internal kernel name
+ *      used by this sensor.
+ *
+ * In effect this function matches a compatible string to an internal kernel
+ * name for a certain sensor device, so that the rest of the autodetection can
+ * rely on that name from this point on. I2C client devices will be renamed
+ * to match the internal kernel convention.
+ */
+void st_sensors_of_i2c_probe(struct i2c_client *client,
+                             const struct of_device_id *match)
+{
+        const struct of_device_id *of_id;
+
+        of_id = of_match_device(match, &client->dev);
+        if (!of_id)
+                return;
+
+        /* The name from the OF match takes precedence if present */
+        strncpy(client->name, of_id->data, sizeof(client->name));
+        client->name[sizeof(client->name) - 1] = '\0';
+}
+EXPORT_SYMBOL(st_sensors_of_i2c_probe);
+#endif
+
 MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
 MODULE_DESCRIPTION("STMicroelectronics ST-sensors i2c driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index 23c12f361b05..8fa0ad2ef4ef 100644
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -18,6 +18,43 @@
 #include <linux/iio/common/st_sensors_i2c.h>
 #include "st_gyro.h"
 
+#ifdef CONFIG_OF
+static const struct of_device_id st_gyro_of_match[] = {
+        {
+                .compatible = "st,l3g4200d-gyro",
+                .data = L3G4200D_GYRO_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm330d-gyro",
+                .data = LSM330D_GYRO_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm330dl-gyro",
+                .data = LSM330DL_GYRO_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm330dlc-gyro",
+                .data = LSM330DLC_GYRO_DEV_NAME,
+        },
+        {
+                .compatible = "st,l3gd20-gyro",
+                .data = L3GD20_GYRO_DEV_NAME,
+        },
+        {
+                .compatible = "st,l3g4is-gyro",
+                .data = L3G4IS_GYRO_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm330-gyro",
+                .data = LSM330_GYRO_DEV_NAME,
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, st_gyro_of_match);
+#else
+#define st_gyro_of_match NULL
+#endif
+
 static int st_gyro_i2c_probe(struct i2c_client *client,
                                                 const struct i2c_device_id *id)
 {
@@ -31,6 +68,7 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
 
         gdata = iio_priv(indio_dev);
         gdata->dev = &client->dev;
+        st_sensors_of_i2c_probe(client, st_gyro_of_match);
 
         st_sensors_i2c_configure(indio_dev, client, gdata);
 
@@ -65,6 +103,7 @@ static struct i2c_driver st_gyro_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "st-gyro-i2c",
+                .of_match_table = of_match_ptr(st_gyro_of_match),
         },
         .probe = st_gyro_i2c_probe,
         .remove = st_gyro_i2c_remove,
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index 892e0feeb5c1..689250058442 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -18,6 +18,27 @@
 #include <linux/iio/common/st_sensors_i2c.h>
 #include "st_magn.h"
 
+#ifdef CONFIG_OF
+static const struct of_device_id st_magn_of_match[] = {
+        {
+                .compatible = "st,lsm303dlhc-magn",
+                .data = LSM303DLHC_MAGN_DEV_NAME,
+        },
+        {
+                .compatible = "st,lsm303dlm-magn",
+                .data = LSM303DLM_MAGN_DEV_NAME,
+        },
+        {
+                .compatible = "st,lis3mdl-magn",
+                .data = LIS3MDL_MAGN_DEV_NAME,
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, st_magn_of_match);
+#else
+#define st_magn_of_match NULL
+#endif
+
 static int st_magn_i2c_probe(struct i2c_client *client,
                                                 const struct i2c_device_id *id)
 {
@@ -31,6 +52,7 @@ static int st_magn_i2c_probe(struct i2c_client *client,
 
         mdata = iio_priv(indio_dev);
         mdata->dev = &client->dev;
+        st_sensors_of_i2c_probe(client, st_magn_of_match);
 
         st_sensors_i2c_configure(indio_dev, client, mdata);
 
@@ -61,6 +83,7 @@ static struct i2c_driver st_magn_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "st-magn-i2c",
+                .of_match_table = of_match_ptr(st_magn_of_match),
         },
         .probe = st_magn_i2c_probe,
         .remove = st_magn_i2c_remove,
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 3cd73e39b840..acaf165260bb 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -18,6 +18,27 @@
 #include <linux/iio/common/st_sensors_i2c.h>
 #include "st_pressure.h"
 
+#ifdef CONFIG_OF
+static const struct of_device_id st_press_of_match[] = {
+        {
+                .compatible = "st,lps001wp-press",
+                .data = LPS001WP_PRESS_DEV_NAME,
+        },
+        {
+                .compatible = "st,lps25h-press",
+                .data = LPS25H_PRESS_DEV_NAME,
+        },
+        {
+                .compatible = "st,lps331ap-press",
+                .data = LPS331AP_PRESS_DEV_NAME,
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, st_press_of_match);
+#else
+#define st_press_of_match NULL
+#endif
+
 static int st_press_i2c_probe(struct i2c_client *client,
                                                 const struct i2c_device_id *id)
 {
@@ -31,6 +52,7 @@ static int st_press_i2c_probe(struct i2c_client *client,
 
         pdata = iio_priv(indio_dev);
         pdata->dev = &client->dev;
+        st_sensors_of_i2c_probe(client, st_press_of_match);
 
         st_sensors_i2c_configure(indio_dev, client, pdata);
 
@@ -60,6 +82,7 @@ static struct i2c_driver st_press_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "st-press-i2c",
+                .of_match_table = of_match_ptr(st_press_of_match),
         },
         .probe = st_press_i2c_probe,
         .remove = st_press_i2c_remove,
diff --git a/include/linux/iio/common/st_sensors_i2c.h b/include/linux/iio/common/st_sensors_i2c.h
index 67d845385ae2..1796af093368 100644
--- a/include/linux/iio/common/st_sensors_i2c.h
+++ b/include/linux/iio/common/st_sensors_i2c.h
@@ -13,8 +13,19 @@
 
 #include <linux/i2c.h>
 #include <linux/iio/common/st_sensors.h>
+#include <linux/of.h>
 
 void st_sensors_i2c_configure(struct iio_dev *indio_dev,
                 struct i2c_client *client, struct st_sensor_data *sdata);
 
+#ifdef CONFIG_OF
+void st_sensors_of_i2c_probe(struct i2c_client *client,
+                             const struct of_device_id *match);
+#else
+static inline void st_sensors_of_i2c_probe(struct i2c_client *client,
+                                           const struct of_device_id *match)
+{
+}
+#endif
+
 #endif /* ST_SENSORS_I2C_H */