drivers: sensor: lis2dh: Configurable latch and mode for any movement

Add 2 properties to configure the "any movement" event.
* Ability to disable the interrupt latch
* Select movement mode

Signed-off-by: Pieter De Gendt <[email protected]>

Author: pdgendt

drivers/sensor/lis2dh/lis2dh.c

@@ -496,6 +496,12 @@ static int lis2dh_pm_action(const struct device *dev,
 #define ANYM_ON_INT1(inst) \
 	DT_INST_PROP(inst, anym_on_int1)
 
+#define ANYM_LATCH(inst) \
+	!DT_INST_PROP(inst, anym_no_latch)
+
+#define ANYM_MODE(inst) \
+	DT_INST_PROP(inst, anym_mode)
+
 #ifdef CONFIG_LIS2DH_TRIGGER
 #define GPIO_DT_SPEC_INST_GET_BY_IDX_COND(id, prop, idx)		\
 	COND_CODE_1(DT_INST_PROP_HAS_IDX(id, prop, idx),		\
@@ -548,9 +554,11 @@ static int lis2dh_pm_action(const struct device *dev,
 					SPI_MODE_CPOL |			\
 					SPI_MODE_CPHA,			\
 					0) },				\
-		.hw = { .is_lsm303agr_dev = IS_LSM303AGR_DEV(inst),		\
-				.disc_pull_up = DISC_PULL_UP(inst),				\
-				.anym_on_int1 = ANYM_ON_INT1(inst), },			\
+		.hw = { .is_lsm303agr_dev = IS_LSM303AGR_DEV(inst),	\
+			.disc_pull_up = DISC_PULL_UP(inst),		\
+			.anym_on_int1 = ANYM_ON_INT1(inst),		\
+			.anym_latch = ANYM_LATCH(inst),			\
+			.anym_mode = ANYM_MODE(inst), },		\
 		LIS2DH_CFG_TEMPERATURE(inst)				\
 		LIS2DH_CFG_INT(inst)					\
 	}
@@ -569,9 +577,11 @@ static int lis2dh_pm_action(const struct device *dev,
 	{								\
 		.bus_init = lis2dh_i2c_init,				\
 		.bus_cfg = { .i2c = I2C_DT_SPEC_INST_GET(inst), },	\
-		.hw = { .is_lsm303agr_dev = IS_LSM303AGR_DEV(inst),		\
-				.disc_pull_up = DISC_PULL_UP(inst),			\
-				.anym_on_int1 = ANYM_ON_INT1(inst), },		\
+		.hw = { .is_lsm303agr_dev = IS_LSM303AGR_DEV(inst),	\
+			.disc_pull_up = DISC_PULL_UP(inst),		\
+			.anym_on_int1 = ANYM_ON_INT1(inst),		\
+			.anym_latch = ANYM_LATCH(inst),			\
+			.anym_mode = ANYM_MODE(inst), },		\
 		LIS2DH_CFG_TEMPERATURE(inst)				\
 		LIS2DH_CFG_INT(inst)					\
 	}

drivers/sensor/lis2dh/lis2dh.h

@@ -159,7 +159,9 @@
 #define LIS2DH_REG_INT2_THS		0x36
 #define LIS2DH_REG_INT2_DUR		0x37
 
-#define LIS2DH_AOI_CFG			BIT(7)
+#define LIS2DH_INT_CFG_MODE_SHIFT	6
+#define LIS2DH_INT_CFG_AOI_CFG		BIT(LIS2DH_INT_CFG_MODE_SHIFT + 1)
+#define LIS2DH_INT_CFG_6D_CFG		BIT(LIS2DH_INT_CFG_MODE_SHIFT)
 #define LIS2DH_INT_CFG_ZHIE_ZUPE	BIT(5)
 #define LIS2DH_INT_CFG_ZLIE_ZDOWNE	BIT(4)
 #define LIS2DH_INT_CFG_YHIE_YUPE	BIT(3)
@@ -208,6 +210,8 @@ struct lis2dh_config {
 		bool is_lsm303agr_dev : 1;
 		bool disc_pull_up : 1;
 		bool anym_on_int1 : 1;
+		bool anym_latch : 1;
+		uint8_t anym_mode : 2;
 	} hw;
 #ifdef CONFIG_LIS2DH_MEASURE_TEMPERATURE
 	const struct temperature temperature;

drivers/sensor/lis2dh/lis2dh_trigger.c

@@ -187,7 +187,7 @@ static int lis2dh_start_trigger_int2(const struct device *dev)
 	return lis2dh->hw_tf->write_reg(
 		dev,
 		cfg->hw.anym_on_int1 ? LIS2DH_REG_INT1_CFG : LIS2DH_REG_INT2_CFG,
-		LIS2DH_ANYM_CFG);
+		(cfg->hw.anym_mode << LIS2DH_INT_CFG_MODE_SHIFT) | LIS2DH_ANYM_CFG);
 }
 
 int lis2dh_trigger_set(const struct device *dev,
@@ -275,7 +275,7 @@ static void lis2dh_gpio_int1_callback(const struct device *dev,
 
 	atomic_set_bit(&lis2dh->trig_flags, TRIGGED_INT1);
 
-	/* int is level triggered so disable until we clear it */
+	/* int is level triggered so disable until processed */
 	setup_int1(lis2dh->dev, false);
 
 #if defined(CONFIG_LIS2DH_TRIGGER_OWN_THREAD)
@@ -295,7 +295,7 @@ static void lis2dh_gpio_int2_callback(const struct device *dev,
 
 	atomic_set_bit(&lis2dh->trig_flags, TRIGGED_INT2);
 
-	/* int is level triggered so disable until we clear it */
+	/* int is level triggered so disable until processed */
 	setup_int2(lis2dh->dev, false);
 
 #if defined(CONFIG_LIS2DH_TRIGGER_OWN_THREAD)
@@ -365,15 +365,17 @@ static void lis2dh_thread_cb(const struct device *dev)
 		};
 		uint8_t reg_val;
 
-		/* clear interrupt to de-assert int line */
-		status = lis2dh->hw_tf->read_reg(dev,
-						 cfg->hw.anym_on_int1 ?
-							       LIS2DH_REG_INT1_SRC :
-							       LIS2DH_REG_INT2_SRC,
-						 &reg_val);
-		if (status < 0) {
-			LOG_ERR("clearing interrupt 2 failed: %d", status);
-			return;
+		if (cfg->hw.anym_latch) {
+			/* clear interrupt to de-assert int line */
+			status = lis2dh->hw_tf->read_reg(dev,
+							 cfg->hw.anym_on_int1 ?
+								LIS2DH_REG_INT1_SRC :
+								LIS2DH_REG_INT2_SRC,
+							 &reg_val);
+			if (status < 0) {
+				LOG_ERR("clearing interrupt 2 failed: %d", status);
+				return;
+			}
 		}
 
 		if (likely(lis2dh->handler_anymotion != NULL)) {
@@ -538,23 +540,25 @@ int lis2dh_init_interrupt(const struct device *dev)
 		status = lis2dh->hw_tf->update_reg(dev, LIS2DH_REG_CTRL3,
 						   LIS2DH_EN_INT1_INT1,
 						   LIS2DH_EN_INT1_INT1);
-
-		/* latch int1 line interrupt */
-		status = lis2dh->hw_tf->write_reg(dev, LIS2DH_REG_CTRL5,
-						  LIS2DH_EN_LIR_INT1);
+		if (cfg->hw.anym_latch) {
+			/* latch int1 line interrupt */
+			status = lis2dh->hw_tf->write_reg(dev, LIS2DH_REG_CTRL5,
+							  LIS2DH_EN_LIR_INT1);
+		}
 	} else {
 		/* enable interrupt 2 on int2 line */
 		status = lis2dh->hw_tf->update_reg(dev, LIS2DH_REG_CTRL6,
 						   LIS2DH_EN_INT2_INT2,
 						   LIS2DH_EN_INT2_INT2);
-
-		/* latch int2 line interrupt */
-		status = lis2dh->hw_tf->write_reg(dev, LIS2DH_REG_CTRL5,
-						  LIS2DH_EN_LIR_INT2);
+		if (cfg->hw.anym_latch) {
+			/* latch int2 line interrupt */
+			status = lis2dh->hw_tf->write_reg(dev, LIS2DH_REG_CTRL5,
+							  LIS2DH_EN_LIR_INT2);
+		}
 	}
 
 	if (status < 0) {
-		LOG_ERR("latch enable reg write failed (%d)", status);
+		LOG_ERR("enable reg write failed (%d)", status);
 		return status;
 	}
 

dts/bindings/sensor/st,lis2dh-common.yaml

@@ -25,3 +25,27 @@ properties:
         Indicates that the device driver should use interrupt 1
         for any movement. This is for boards that only have one
         interrupt line connected from the sensor to the processor.
+
+    anym-no-latch:
+      type: boolean
+      description: |
+        Disable the latching of interrupts for any movement.
+
+    anym-mode:
+      type: int
+      required: false
+      default: 0
+      description: |
+        Select the interrupt mode for any movement.
+
+        0 = OR combination of interrupt events
+        1 = 6D movement recognition
+        2 = AND combination of interrupt events
+        3 = 6D position recognition
+
+        The default of 0 is the power-on-reset value.
+      enum:
+        - 0
+        - 1
+        - 2
+        - 3