iio: accel: adxl313: add inactivity sensing

Enhance the interrupt handler to process inactivity events. Introduce
functions to configure the threshold and period registers for
inactivity detection, as well as to enable or disable the inactivity
feature. Extend the fake IIO channel to handle inactivity events by
combining the x, y, and z axes using a logical AND operation.

Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20250702230819.19353-6-l.rubusch@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/adxl313.h b/drivers/iio/accel/adxl313.h
index 4f4a9fd39f6dd7bdd48c5ada701e7e3083537d59..d7e8cb44855b7087112af5ecc3bbbe4faf5c215f 100644 (file)
--- a/drivers/iio/accel/adxl313.h
+++ b/drivers/iio/accel/adxl313.h
@@ -18,6 +18,8 @@
 #define ADXL313_REG_SOFT_RESET         0x18
 #define ADXL313_REG_OFS_AXIS(index)    (0x1E + (index))
 #define ADXL313_REG_THRESH_ACT         0x24
+#define ADXL313_REG_THRESH_INACT       0x25
+#define ADXL313_REG_TIME_INACT         0x26
 #define ADXL313_REG_ACT_INACT_CTL      0x27
 #define ADXL313_REG_BW_RATE            0x2C
 #define ADXL313_REG_POWER_CTL          0x2D

diff --git a/drivers/iio/accel/adxl313_core.c b/drivers/iio/accel/adxl313_core.c
index 1ad8ffd5f9aede9d105b1728feafdd7154425adb..5b6faa83be02b309ac61ec8c3b82806940b046ed 100644 (file)
--- a/drivers/iio/accel/adxl313_core.c
+++ b/drivers/iio/accel/adxl313_core.c
@@ -28,18 +28,22 @@
 #define ADXL313_REG_XYZ_BASE                   ADXL313_REG_DATA_AXIS(0)
 
 #define ADXL313_ACT_XYZ_EN                     GENMASK(6, 4)
+#define ADXL313_INACT_XYZ_EN                   GENMASK(2, 0)
 
 /* activity/inactivity */
 enum adxl313_activity_type {
        ADXL313_ACTIVITY,
+       ADXL313_INACTIVITY,
 };
 
 static const unsigned int adxl313_act_int_reg[] = {
        [ADXL313_ACTIVITY] = ADXL313_INT_ACTIVITY,
+       [ADXL313_INACTIVITY] = ADXL313_INT_INACTIVITY,
 };
 
 static const unsigned int adxl313_act_thresh_reg[] = {
        [ADXL313_ACTIVITY] = ADXL313_REG_THRESH_ACT,
+       [ADXL313_INACTIVITY] = ADXL313_REG_THRESH_INACT,
 };
 
 static const struct regmap_range adxl312_readable_reg_range[] = {
@@ -253,6 +257,17 @@ static const struct iio_event_spec adxl313_activity_events[] = {
        },
 };
 
+static const struct iio_event_spec adxl313_inactivity_events[] = {
+       {
+               /* inactivity */
+               .type = IIO_EV_TYPE_MAG,
+               .dir = IIO_EV_DIR_FALLING,
+               .mask_separate = BIT(IIO_EV_INFO_ENABLE),
+               .mask_shared_by_type = BIT(IIO_EV_INFO_VALUE) |
+                       BIT(IIO_EV_INFO_PERIOD),
+       },
+};
+
 enum adxl313_chans {
        chan_x, chan_y, chan_z,
 };
@@ -269,6 +284,14 @@ static const struct iio_chan_spec adxl313_channels[] = {
                .event_spec = adxl313_activity_events,
                .num_event_specs = ARRAY_SIZE(adxl313_activity_events),
        },
+       {
+               .type = IIO_ACCEL,
+               .modified = 1,
+               .channel2 = IIO_MOD_X_AND_Y_AND_Z,
+               .scan_index = -1, /* Fake channel for axis AND'ing */
+               .event_spec = adxl313_inactivity_events,
+               .num_event_specs = ARRAY_SIZE(adxl313_inactivity_events),
+       },
 };
 
 static const unsigned long adxl313_scan_masks[] = {
@@ -331,6 +354,15 @@ static int adxl313_read_freq_avail(struct iio_dev *indio_dev,
        }
 }
 
+static int adxl313_set_inact_time_s(struct adxl313_data *data,
+                                   unsigned int val_s)
+{
+       unsigned int max_boundary = U8_MAX; /* by register size */
+       unsigned int val = min(val_s, max_boundary);
+
+       return regmap_write(data->regmap, ADXL313_REG_TIME_INACT, val);
+}
+
 static int adxl313_is_act_inact_en(struct adxl313_data *data,
                                   enum adxl313_activity_type type)
 {
@@ -348,6 +380,10 @@ static int adxl313_is_act_inact_en(struct adxl313_data *data,
                if (!FIELD_GET(ADXL313_ACT_XYZ_EN, axis_ctrl))
                        return false;
                break;
+       case ADXL313_INACTIVITY:
+               if (!FIELD_GET(ADXL313_INACT_XYZ_EN, axis_ctrl))
+                       return false;
+               break;
        default:
                return -EINVAL;
        }
@@ -366,6 +402,7 @@ static int adxl313_set_act_inact_en(struct adxl313_data *data,
 {
        unsigned int axis_ctrl;
        unsigned int threshold;
+       unsigned int inact_time_s;
        int ret;
 
        if (cmd_en) {
@@ -377,6 +414,18 @@ static int adxl313_set_act_inact_en(struct adxl313_data *data,
 
                if (!threshold) /* Just ignore the command if threshold is 0 */
                        return 0;
+
+               /* When turning on inactivity, check if inact time is valid */
+               if (type == ADXL313_INACTIVITY) {
+                       ret = regmap_read(data->regmap,
+                                         ADXL313_REG_TIME_INACT,
+                                         &inact_time_s);
+                       if (ret)
+                               return ret;
+
+                       if (!inact_time_s)
+                               return 0;
+               }
        }
 
        /* Start modifying configuration registers */
@@ -389,6 +438,9 @@ static int adxl313_set_act_inact_en(struct adxl313_data *data,
        case ADXL313_ACTIVITY:
                axis_ctrl = ADXL313_ACT_XYZ_EN;
                break;
+       case ADXL313_INACTIVITY:
+               axis_ctrl = ADXL313_INACT_XYZ_EN;
+               break;
        default:
                return -EINVAL;
        }
@@ -481,11 +533,14 @@ static int adxl313_write_raw(struct iio_dev *indio_dev,
 
 static int adxl313_read_mag_config(struct adxl313_data *data,
                                   enum iio_event_direction dir,
-                                  enum adxl313_activity_type type_act)
+                                  enum adxl313_activity_type type_act,
+                                  enum adxl313_activity_type type_inact)
 {
        switch (dir) {
        case IIO_EV_DIR_RISING:
                return !!adxl313_is_act_inact_en(data, type_act);
+       case IIO_EV_DIR_FALLING:
+               return !!adxl313_is_act_inact_en(data, type_inact);
        default:
                return -EINVAL;
        }
@@ -494,11 +549,14 @@ static int adxl313_read_mag_config(struct adxl313_data *data,
 static int adxl313_write_mag_config(struct adxl313_data *data,
                                    enum iio_event_direction dir,
                                    enum adxl313_activity_type type_act,
+                                   enum adxl313_activity_type type_inact,
                                    bool state)
 {
        switch (dir) {
        case IIO_EV_DIR_RISING:
                return adxl313_set_act_inact_en(data, type_act, state);
+       case IIO_EV_DIR_FALLING:
+               return adxl313_set_act_inact_en(data, type_inact, state);
        default:
                return -EINVAL;
        }
@@ -514,7 +572,8 @@ static int adxl313_read_event_config(struct iio_dev *indio_dev,
        switch (type) {
        case IIO_EV_TYPE_MAG:
                return adxl313_read_mag_config(data, dir,
-                                              ADXL313_ACTIVITY);
+                                              ADXL313_ACTIVITY,
+                                              ADXL313_INACTIVITY);
        default:
                return -EINVAL;
        }
@@ -532,6 +591,7 @@ static int adxl313_write_event_config(struct iio_dev *indio_dev,
        case IIO_EV_TYPE_MAG:
                return adxl313_write_mag_config(data, dir,
                                                ADXL313_ACTIVITY,
+                                               ADXL313_INACTIVITY,
                                                state);
        default:
                return -EINVAL;
@@ -542,9 +602,11 @@ static int adxl313_read_mag_value(struct adxl313_data *data,
                                  enum iio_event_direction dir,
                                  enum iio_event_info info,
                                  enum adxl313_activity_type type_act,
+                                 enum adxl313_activity_type type_inact,
                                  int *val, int *val2)
 {
        unsigned int threshold;
+       unsigned int period;
        int ret;
 
        switch (info) {
@@ -559,9 +621,25 @@ static int adxl313_read_mag_value(struct adxl313_data *data,
                        *val = threshold * 15625;
                        *val2 = MICRO;
                        return IIO_VAL_FRACTIONAL;
+               case IIO_EV_DIR_FALLING:
+                       ret = regmap_read(data->regmap,
+                                         adxl313_act_thresh_reg[type_inact],
+                                         &threshold);
+                       if (ret)
+                               return ret;
+                       *val = threshold * 15625;
+                       *val2 = MICRO;
+                       return IIO_VAL_FRACTIONAL;
                default:
                        return -EINVAL;
                }
+       case IIO_EV_INFO_PERIOD:
+               ret = regmap_read(data->regmap, ADXL313_REG_TIME_INACT,
+                                 &period);
+               if (ret)
+                       return ret;
+               *val = period;
+               return IIO_VAL_INT;
        default:
                return -EINVAL;
        }
@@ -571,6 +649,7 @@ static int adxl313_write_mag_value(struct adxl313_data *data,
                                   enum iio_event_direction dir,
                                   enum iio_event_info info,
                                   enum adxl313_activity_type type_act,
+                                  enum adxl313_activity_type type_inact,
                                   int val, int val2)
 {
        unsigned int regval;
@@ -584,9 +663,15 @@ static int adxl313_write_mag_value(struct adxl313_data *data,
                        return regmap_write(data->regmap,
                                            adxl313_act_thresh_reg[type_act],
                                            regval);
+               case IIO_EV_DIR_FALLING:
+                       return regmap_write(data->regmap,
+                                           adxl313_act_thresh_reg[type_inact],
+                                           regval);
                default:
                        return -EINVAL;
                }
+       case IIO_EV_INFO_PERIOD:
+               return adxl313_set_inact_time_s(data, val);
        default:
                return -EINVAL;
        }
@@ -605,6 +690,7 @@ static int adxl313_read_event_value(struct iio_dev *indio_dev,
        case IIO_EV_TYPE_MAG:
                return adxl313_read_mag_value(data, dir, info,
                                              ADXL313_ACTIVITY,
+                                             ADXL313_INACTIVITY,
                                              val, val2);
        default:
                return -EINVAL;
@@ -624,6 +710,7 @@ static int adxl313_write_event_value(struct iio_dev *indio_dev,
        case IIO_EV_TYPE_MAG:
                return adxl313_write_mag_value(data, dir, info,
                                               ADXL313_ACTIVITY,
+                                              ADXL313_INACTIVITY,
                                               val, val2);
        default:
                return -EINVAL;
@@ -784,6 +871,17 @@ static int adxl313_push_events(struct iio_dev *indio_dev, int int_stat)
                        return ret;
        }
 
+       if (FIELD_GET(ADXL313_INT_INACTIVITY, int_stat)) {
+               ret = iio_push_event(indio_dev,
+                                    IIO_MOD_EVENT_CODE(IIO_ACCEL, 0,
+                                                       IIO_MOD_X_AND_Y_AND_Z,
+                                                       IIO_EV_TYPE_MAG,
+                                                       IIO_EV_DIR_FALLING),
+                                    ts);
+               if (ret)
+                       return ret;
+       }
+
        return ret;
 }
 
@@ -989,6 +1087,14 @@ int adxl313_core_probe(struct device *dev,
                if (ret)
                        return ret;
 
+               ret = regmap_write(data->regmap, ADXL313_REG_TIME_INACT, 5);
+               if (ret)
+                       return ret;
+
+               ret = regmap_write(data->regmap, ADXL313_REG_THRESH_INACT, 0x4f);
+               if (ret)
+                       return ret;
+
                ret = regmap_write(data->regmap, ADXL313_REG_THRESH_ACT, 0x52);
                if (ret)
                        return ret;