iio: Added ST-sensors platform data to select the DRDY interrupt pin

This patch add support to redirect the DRDY interrupt on INT1 or INT2
on accelerometer and pressure sensors.

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

4 files changed, 21 insertions, 9 deletions

diff --git a/drivers/iio/gyro/st_gyro.h b/drivers/iio/gyro/st_gyro.h
index 3ad9907bb154..f8f2bf84a5a2 100644
--- a/drivers/iio/gyro/st_gyro.h
+++ b/drivers/iio/gyro/st_gyro.h
@@ -23,7 +23,16 @@
 #define L3G4IS_GYRO_DEV_NAME            "l3g4is_ui"
 #define LSM330_GYRO_DEV_NAME            "lsm330_gyro"
 
-int st_gyro_common_probe(struct iio_dev *indio_dev);
+/**
+ * struct st_sensors_platform_data - gyro platform data
+ * @drdy_int_pin: DRDY on gyros is available only on INT2 pin.
+ */
+static const struct st_sensors_platform_data gyro_pdata = {
+        .drdy_int_pin = 2,
+};
+
+int st_gyro_common_probe(struct iio_dev *indio_dev,
+                                        struct st_sensors_platform_data *pdata);
 void st_gyro_common_remove(struct iio_dev *indio_dev);
 
 #ifdef CONFIG_IIO_BUFFER
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index f9ed3488c314..85fa8d343bb2 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -60,7 +60,7 @@
 #define ST_GYRO_1_BDU_ADDR                      0x23
 #define ST_GYRO_1_BDU_MASK                      0x80
 #define ST_GYRO_1_DRDY_IRQ_ADDR                 0x22
-#define ST_GYRO_1_DRDY_IRQ_MASK                 0x08
+#define ST_GYRO_1_DRDY_IRQ_INT2_MASK            0x08
 #define ST_GYRO_1_MULTIREAD_BIT                 true
 
 /* CUSTOM VALUES FOR SENSOR 2 */
@@ -84,7 +84,7 @@
 #define ST_GYRO_2_BDU_ADDR                      0x23
 #define ST_GYRO_2_BDU_MASK                      0x80
 #define ST_GYRO_2_DRDY_IRQ_ADDR                 0x22
-#define ST_GYRO_2_DRDY_IRQ_MASK                 0x08
+#define ST_GYRO_2_DRDY_IRQ_INT2_MASK            0x08
 #define ST_GYRO_2_MULTIREAD_BIT                 true
 
 static const struct iio_chan_spec st_gyro_16bit_channels[] = {
@@ -158,7 +158,7 @@ static const struct st_sensors st_gyro_sensors[] = {
                 },
                 .drdy_irq = {
                         .addr = ST_GYRO_1_DRDY_IRQ_ADDR,
-                        .mask = ST_GYRO_1_DRDY_IRQ_MASK,
+                        .mask_int2 = ST_GYRO_1_DRDY_IRQ_INT2_MASK,
                 },
                 .multi_read_bit = ST_GYRO_1_MULTIREAD_BIT,
                 .bootime = 2,
@@ -221,7 +221,7 @@ static const struct st_sensors st_gyro_sensors[] = {
                 },
                 .drdy_irq = {
                         .addr = ST_GYRO_2_DRDY_IRQ_ADDR,
-                        .mask = ST_GYRO_2_DRDY_IRQ_MASK,
+                        .mask_int2 = ST_GYRO_2_DRDY_IRQ_INT2_MASK,
                 },
                 .multi_read_bit = ST_GYRO_2_MULTIREAD_BIT,
                 .bootime = 2,
@@ -302,7 +302,8 @@ static const struct iio_trigger_ops st_gyro_trigger_ops = {
 #define ST_GYRO_TRIGGER_OPS NULL
 #endif
 
-int st_gyro_common_probe(struct iio_dev *indio_dev)
+int st_gyro_common_probe(struct iio_dev *indio_dev,
+                                        struct st_sensors_platform_data *pdata)
 {
         int err;
         struct st_sensor_data *gdata = iio_priv(indio_dev);
@@ -324,7 +325,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev)
                                                 &gdata->sensor->fs.fs_avl[0];
         gdata->odr = gdata->sensor->odr.odr_avl[0].hz;
 
-        err = st_sensors_init_sensor(indio_dev);
+        err = st_sensors_init_sensor(indio_dev, pdata);
         if (err < 0)
                 goto st_gyro_common_probe_error;
 
diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index 8a310500573d..c7a29a4d7e82 100644
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -36,7 +36,8 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
 
         st_sensors_i2c_configure(indio_dev, client, gdata);
 
-        err = st_gyro_common_probe(indio_dev);
+        err = st_gyro_common_probe(indio_dev,
+                                (struct st_sensors_platform_data *)&gyro_pdata);
         if (err < 0)
                 goto st_gyro_common_probe_error;
 
diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
index f3540390eb22..14b0762847f5 100644
--- a/drivers/iio/gyro/st_gyro_spi.c
+++ b/drivers/iio/gyro/st_gyro_spi.c
@@ -35,7 +35,8 @@ static int st_gyro_spi_probe(struct spi_device *spi)
 
         st_sensors_spi_configure(indio_dev, spi, gdata);
 
-        err = st_gyro_common_probe(indio_dev);
+        err = st_gyro_common_probe(indio_dev,
+                                (struct st_sensors_platform_data *)&gyro_pdata);
         if (err < 0)
                 goto st_gyro_common_probe_error;