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, 31 insertions, 11 deletions

diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
index 37949b94377d..c3877630b2e4 100644
--- a/drivers/iio/accel/st_accel.h
+++ b/drivers/iio/accel/st_accel.h
@@ -25,7 +25,16 @@
 #define LSM303DLM_ACCEL_DEV_NAME        "lsm303dlm_accel"
 #define LSM330_ACCEL_DEV_NAME           "lsm330_accel"
 
-int st_accel_common_probe(struct iio_dev *indio_dev);
+/**
+* struct st_sensors_platform_data - default accel platform data
+* @drdy_int_pin: default accel DRDY is available on INT1 pin.
+*/
+static const struct st_sensors_platform_data default_accel_pdata = {
+        .drdy_int_pin = 1,
+};
+
+int st_accel_common_probe(struct iio_dev *indio_dev,
+                                        struct st_sensors_platform_data *pdata);
 void st_accel_common_remove(struct iio_dev *indio_dev);
 
 #ifdef CONFIG_IIO_BUFFER
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 4aec121261d7..aef3c9be7366 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -65,7 +65,8 @@
 #define ST_ACCEL_1_BDU_ADDR                     0x23
 #define ST_ACCEL_1_BDU_MASK                     0x80
 #define ST_ACCEL_1_DRDY_IRQ_ADDR                0x22
-#define ST_ACCEL_1_DRDY_IRQ_MASK                0x10
+#define ST_ACCEL_1_DRDY_IRQ_INT1_MASK           0x10
+#define ST_ACCEL_1_DRDY_IRQ_INT2_MASK           0x08
 #define ST_ACCEL_1_MULTIREAD_BIT                true
 
 /* CUSTOM VALUES FOR SENSOR 2 */
@@ -89,7 +90,8 @@
 #define ST_ACCEL_2_BDU_ADDR                     0x23
 #define ST_ACCEL_2_BDU_MASK                     0x80
 #define ST_ACCEL_2_DRDY_IRQ_ADDR                0x22
-#define ST_ACCEL_2_DRDY_IRQ_MASK                0x02
+#define ST_ACCEL_2_DRDY_IRQ_INT1_MASK           0x02
+#define ST_ACCEL_2_DRDY_IRQ_INT2_MASK           0x10
 #define ST_ACCEL_2_MULTIREAD_BIT                true
 
 /* CUSTOM VALUES FOR SENSOR 3 */
@@ -121,7 +123,8 @@
 #define ST_ACCEL_3_BDU_ADDR                     0x20
 #define ST_ACCEL_3_BDU_MASK                     0x08
 #define ST_ACCEL_3_DRDY_IRQ_ADDR                0x23
-#define ST_ACCEL_3_DRDY_IRQ_MASK                0x80
+#define ST_ACCEL_3_DRDY_IRQ_INT1_MASK           0x80
+#define ST_ACCEL_3_DRDY_IRQ_INT2_MASK           0x00
 #define ST_ACCEL_3_IG1_EN_ADDR                  0x23
 #define ST_ACCEL_3_IG1_EN_MASK                  0x08
 #define ST_ACCEL_3_MULTIREAD_BIT                false
@@ -224,7 +227,8 @@ static const struct st_sensors st_accel_sensors[] = {
                 },
                 .drdy_irq = {
                         .addr = ST_ACCEL_1_DRDY_IRQ_ADDR,
-                        .mask = ST_ACCEL_1_DRDY_IRQ_MASK,
+                        .mask_int1 = ST_ACCEL_1_DRDY_IRQ_INT1_MASK,
+                        .mask_int2 = ST_ACCEL_1_DRDY_IRQ_INT2_MASK,
                 },
                 .multi_read_bit = ST_ACCEL_1_MULTIREAD_BIT,
                 .bootime = 2,
@@ -285,7 +289,8 @@ static const struct st_sensors st_accel_sensors[] = {
                 },
                 .drdy_irq = {
                         .addr = ST_ACCEL_2_DRDY_IRQ_ADDR,
-                        .mask = ST_ACCEL_2_DRDY_IRQ_MASK,
+                        .mask_int1 = ST_ACCEL_2_DRDY_IRQ_INT1_MASK,
+                        .mask_int2 = ST_ACCEL_2_DRDY_IRQ_INT2_MASK,
                 },
                 .multi_read_bit = ST_ACCEL_2_MULTIREAD_BIT,
                 .bootime = 2,
@@ -358,7 +363,8 @@ static const struct st_sensors st_accel_sensors[] = {
                 },
                 .drdy_irq = {
                         .addr = ST_ACCEL_3_DRDY_IRQ_ADDR,
-                        .mask = ST_ACCEL_3_DRDY_IRQ_MASK,
+                        .mask_int1 = ST_ACCEL_3_DRDY_IRQ_INT1_MASK,
+                        .mask_int2 = ST_ACCEL_3_DRDY_IRQ_INT2_MASK,
                         .ig1 = {
                                 .en_addr = ST_ACCEL_3_IG1_EN_ADDR,
                                 .en_mask = ST_ACCEL_3_IG1_EN_MASK,
@@ -443,7 +449,8 @@ static const struct iio_trigger_ops st_accel_trigger_ops = {
 #define ST_ACCEL_TRIGGER_OPS NULL
 #endif
 
-int st_accel_common_probe(struct iio_dev *indio_dev)
+int st_accel_common_probe(struct iio_dev *indio_dev,
+                                struct st_sensors_platform_data *plat_data)
 {
         int err;
         struct st_sensor_data *adata = iio_priv(indio_dev);
@@ -465,7 +472,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
                                                 &adata->sensor->fs.fs_avl[0];
         adata->odr = adata->sensor->odr.odr_avl[0].hz;
 
-        err = st_sensors_init_sensor(indio_dev);
+        if (!plat_data)
+                plat_data =
+                        (struct st_sensors_platform_data *)&default_accel_pdata;
+
+        err = st_sensors_init_sensor(indio_dev, plat_data);
         if (err < 0)
                 goto st_accel_common_probe_error;
 
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index ffc9d097e484..58d164d90dca 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -36,7 +36,7 @@ static int st_accel_i2c_probe(struct i2c_client *client,
 
         st_sensors_i2c_configure(indio_dev, client, adata);
 
-        err = st_accel_common_probe(indio_dev);
+        err = st_accel_common_probe(indio_dev, client->dev.platform_data);
         if (err < 0)
                 goto st_accel_common_probe_error;
 
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 22b35bfea7d2..21ed9296311f 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -35,7 +35,7 @@ static int st_accel_spi_probe(struct spi_device *spi)
 
         st_sensors_spi_configure(indio_dev, spi, adata);
 
-        err = st_accel_common_probe(indio_dev);
+        err = st_accel_common_probe(indio_dev, spi->dev.platform_data);
         if (err < 0)
                 goto st_accel_common_probe_error;