iio:accel: Register buffer also without specific trigger

[~andy/linux] / drivers / iio / accel / st_accel_core.c

diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 4aec121261d7bdd00993af55381c7371d8eb0ce1..38caedc76b98f20520f9be751fabc15e90b03793 100644 (file)
--- 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,10 +449,12 @@ 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);
+       int irq = adata->get_irq_data_ready(indio_dev);
+       int err;
 
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &accel_info;
@@ -454,7 +462,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
        err = st_sensors_check_device_support(indio_dev,
                                ARRAY_SIZE(st_accel_sensors), st_accel_sensors);
        if (err < 0)
-               goto st_accel_common_probe_error;
+               return err;
 
        adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;
        adata->multiread_bit = adata->sensor->multi_read_bit;
@@ -465,15 +473,19 @@ 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;
+               return err;
 
-       if (adata->get_irq_data_ready(indio_dev) > 0) {
-               err = st_accel_allocate_ring(indio_dev);
-               if (err < 0)
-                       goto st_accel_common_probe_error;
+       err = st_accel_allocate_ring(indio_dev);
+       if (err < 0)
+               return err;
 
+       if (irq > 0) {
                err = st_sensors_allocate_trigger(indio_dev,
                                                 ST_ACCEL_TRIGGER_OPS);
                if (err < 0)
@@ -484,15 +496,14 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
        if (err)
                goto st_accel_device_register_error;
 
-       return err;
+       return 0;
 
 st_accel_device_register_error:
-       if (adata->get_irq_data_ready(indio_dev) > 0)
+       if (irq > 0)
                st_sensors_deallocate_trigger(indio_dev);
 st_accel_probe_trigger_error:
-       if (adata->get_irq_data_ready(indio_dev) > 0)
-               st_accel_deallocate_ring(indio_dev);
-st_accel_common_probe_error:
+       st_accel_deallocate_ring(indio_dev);
+
        return err;
 }
 EXPORT_SYMBOL(st_accel_common_probe);
@@ -502,11 +513,10 @@ void st_accel_common_remove(struct iio_dev *indio_dev)
        struct st_sensor_data *adata = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
-       if (adata->get_irq_data_ready(indio_dev) > 0) {
+       if (adata->get_irq_data_ready(indio_dev) > 0)
                st_sensors_deallocate_trigger(indio_dev);
-               st_accel_deallocate_ring(indio_dev);
-       }
-       iio_device_free(indio_dev);
+
+       st_accel_deallocate_ring(indio_dev);
 }
 EXPORT_SYMBOL(st_accel_common_remove);