1. Patchew
  2. linux
  3. [PATCH v3 0/5] iio: accel: bma400: Refactor GENINTR config and register macros
  4. View patch

[PATCH v3 2/5] iio: accel: bma400: Use macros for generic event configuration values

Akshay Jindal posted 5 patches 4 months, 1 week ago
There is a newer version of this series
[PATCH v3 2/5] iio: accel: bma400: Use macros for generic event configuration values
Posted by Akshay Jindal 4 months, 1 week ago 
Add macros and enums for configuration values used in generic event
handling for activity and inactivity detection. Replace hard-coded
values in activity_event_en() with the new definitions to make the
configuration explicit.

No functional changes are intended.

Signed-off-by: Akshay Jindal <akshayaj.lkd@gmail.com>
---
 drivers/iio/accel/bma400.h      | 30 ++++++++++++++++++++++++++++++
 drivers/iio/accel/bma400_core.c | 14 +++++++++++---
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h
index ae3411c090c9..13fe2e5a3175 100644
--- a/drivers/iio/accel/bma400.h
+++ b/drivers/iio/accel/bma400.h
@@ -106,8 +106,38 @@
 #define BMA400_GEN1INT_CONFIG0_REG      0x3f
 #define BMA400_GEN2INT_CONFIG0_REG      0x4A
 #define BMA400_GENINT_CONFIG0_HYST_MASK		GENMASK(1, 0)
+#define BMA400_GENINT_CONFIG0_REF_UPD_MODE_MASK	GENMASK(3, 2)
+#define BMA400_GENINT_CONFIG0_DATA_SRC_MASK	BIT(4)
+#define BMA400_GENINT_CONFIG0_X_EN_MASK		BIT(5)
+#define BMA400_GENINT_CONFIG0_Y_EN_MASK		BIT(6)
+#define BMA400_GENINT_CONFIG0_Z_EN_MASK		BIT(7)
+
+enum bma400_accel_data_src {
+	ACCEL_FILT1,
+	ACCEL_FILT2,
+};
+
+enum bma400_ref_updt_mode {
+	BMA400_REF_MANUAL_UPDT_MODE,
+	BMA400_REF_ONETIME_UPDT_MODE,
+	BMA400_REF_EVERYTIME_UPDT_MODE,
+	BMA400_REF_EVERYTIME_LP_UPDT_MODE,
+};
 
 #define BMA400_GEN_CONFIG1_OFF      0x01
+#define BMA400_GENINT_CONFIG1_AXES_COMB_MASK	BIT(0)
+#define BMA400_GENINT_CONFIG1_DETCT_CRIT_MASK	BIT(1)
+
+enum bma400_genintr_acceleval_axescomb {
+	BMA400_EVAL_X_OR_Y_OR_Z,
+	BMA400_EVAL_X_AND_Y_AND_Z,
+};
+
+enum bma400_detect_criterion {
+	BMA400_DETECT_INACTIVITY,
+	BMA400_DETECT_ACTIVITY,
+};
+
 #define BMA400_GEN_CONFIG2_OFF      0x02
 #define BMA400_GEN_CONFIG3_OFF      0x03
 #define BMA400_GEN_CONFIG31_OFF     0x04
diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_core.c
index 35d2b90425f8..58c378ba9931 100644
--- a/drivers/iio/accel/bma400_core.c
+++ b/drivers/iio/accel/bma400_core.c
@@ -1166,14 +1166,16 @@ static int bma400_activity_event_en(struct bma400_data *data,
 	case IIO_EV_DIR_RISING:
 		reg = BMA400_GEN1INT_CONFIG0_REG;
 		msk = BMA400_INT_CONFIG0_GEN1_MASK;
-		value = 2;
+		value = FIELD_PREP(BMA400_GENINT_CONFIG1_AXES_COMB_MASK, BMA400_EVAL_X_OR_Y_OR_Z) |
+			FIELD_PREP(BMA400_GENINT_CONFIG1_DETCT_CRIT_MASK, BMA400_DETECT_ACTIVITY);
 		set_mask_bits(&field_value, BMA400_INT_CONFIG0_GEN1_MASK,
 			      FIELD_PREP(BMA400_INT_CONFIG0_GEN1_MASK, state));
 		break;
 	case IIO_EV_DIR_FALLING:
 		reg = BMA400_GEN2INT_CONFIG0_REG;
 		msk = BMA400_INT_CONFIG0_GEN2_MASK;
-		value = 0;
+		value = FIELD_PREP(BMA400_GENINT_CONFIG1_AXES_COMB_MASK, BMA400_EVAL_X_OR_Y_OR_Z) |
+			FIELD_PREP(BMA400_GENINT_CONFIG1_DETCT_CRIT_MASK, BMA400_DETECT_INACTIVITY);
 		set_mask_bits(&field_value, BMA400_INT_CONFIG0_GEN2_MASK,
 			      FIELD_PREP(BMA400_INT_CONFIG0_GEN2_MASK, state));
 		break;
@@ -1182,7 +1184,13 @@ static int bma400_activity_event_en(struct bma400_data *data,
 	}
 
 	/* Enabling all axis for interrupt evaluation */
-	ret = regmap_write(data->regmap, reg, 0xF8);
+	ret = regmap_write(data->regmap, reg,
+			   BMA400_GENINT_CONFIG0_X_EN_MASK |
+			   BMA400_GENINT_CONFIG0_Y_EN_MASK |
+			   BMA400_GENINT_CONFIG0_Z_EN_MASK|
+			   FIELD_PREP(BMA400_GENINT_CONFIG0_DATA_SRC_MASK, ACCEL_FILT2)|
+			   FIELD_PREP(BMA400_GENINT_CONFIG0_REF_UPD_MODE_MASK,
+				      BMA400_REF_EVERYTIME_UPDT_MODE));
 	if (ret)
 		return ret;
 
-- 
2.43.0
Re: [PATCH v3 2/5] iio: accel: bma400: Use macros for generic event configuration values
Posted by Jonathan Cameron 4 months, 1 week ago 
On Fri,  3 Oct 2025 00:11:03 +0530
Akshay Jindal <akshayaj.lkd@gmail.com> wrote:

> Add macros and enums for configuration values used in generic event
> handling for activity and inactivity detection. Replace hard-coded
> values in activity_event_en() with the new definitions to make the
> configuration explicit.
> 
> No functional changes are intended.
> 
> Signed-off-by: Akshay Jindal <akshayaj.lkd@gmail.com>
> ---
>  drivers/iio/accel/bma400.h      | 30 ++++++++++++++++++++++++++++++
>  drivers/iio/accel/bma400_core.c | 14 +++++++++++---
>  2 files changed, 41 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h
> index ae3411c090c9..13fe2e5a3175 100644
> --- a/drivers/iio/accel/bma400.h
> +++ b/drivers/iio/accel/bma400.h
> @@ -106,8 +106,38 @@
>  #define BMA400_GEN1INT_CONFIG0_REG      0x3f
>  #define BMA400_GEN2INT_CONFIG0_REG      0x4A
>  #define BMA400_GENINT_CONFIG0_HYST_MASK		GENMASK(1, 0)
> +#define BMA400_GENINT_CONFIG0_REF_UPD_MODE_MASK	GENMASK(3, 2)
> +#define BMA400_GENINT_CONFIG0_DATA_SRC_MASK	BIT(4)
> +#define BMA400_GENINT_CONFIG0_X_EN_MASK		BIT(5)
> +#define BMA400_GENINT_CONFIG0_Y_EN_MASK		BIT(6)
> +#define BMA400_GENINT_CONFIG0_Z_EN_MASK		BIT(7)
> +
> +enum bma400_accel_data_src {
> +	ACCEL_FILT1,
> +	ACCEL_FILT2,
> +};
> +
> +enum bma400_ref_updt_mode {
> +	BMA400_REF_MANUAL_UPDT_MODE,
> +	BMA400_REF_ONETIME_UPDT_MODE,
> +	BMA400_REF_EVERYTIME_UPDT_MODE,
> +	BMA400_REF_EVERYTIME_LP_UPDT_MODE,
> +};
>  
>  #define BMA400_GEN_CONFIG1_OFF      0x01
> +#define BMA400_GENINT_CONFIG1_AXES_COMB_MASK	BIT(0)
> +#define BMA400_GENINT_CONFIG1_DETCT_CRIT_MASK	BIT(1)
> +
> +enum bma400_genintr_acceleval_axescomb {
> +	BMA400_EVAL_X_OR_Y_OR_Z,
> +	BMA400_EVAL_X_AND_Y_AND_Z,

An enum for potential field values only makes sense if you are going to
use it as a type somewhere.  If not it is simpler to just
use a define next to the mask for the field.  Also these should be named
with prefixes that align with that mask.
If you do use it as a type in future patches that's fine but the naming
point still remains and you should specify values = 0, = 1 etc
as they matter whereas implication of using an enum is that the actual
values assigned doesn't matter.

Same applies to the other enums introduced in here.
> +};
> +
> +enum bma400_detect_criterion {
> +	BMA400_DETECT_INACTIVITY,
> +	BMA400_DETECT_ACTIVITY,
> +};
> +
>  #define BMA400_GEN_CONFIG2_OFF      0x02
>  #define BMA400_GEN_CONFIG3_OFF      0x03
>  #define BMA400_GEN_CONFIG31_OFF     0x04
> diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_core.c
> index 35d2b90425f8..58c378ba9931 100644
> --- a/drivers/iio/accel/bma400_core.c
> +++ b/drivers/iio/accel/bma400_core.c
> @@ -1166,14 +1166,16 @@ static int bma400_activity_event_en(struct bma400_data *data,
>  	case IIO_EV_DIR_RISING:
>  		reg = BMA400_GEN1INT_CONFIG0_REG;
>  		msk = BMA400_INT_CONFIG0_GEN1_MASK;
> -		value = 2;
> +		value = FIELD_PREP(BMA400_GENINT_CONFIG1_AXES_COMB_MASK, BMA400_EVAL_X_OR_Y_OR_Z) |
> +			FIELD_PREP(BMA400_GENINT_CONFIG1_DETCT_CRIT_MASK, BMA400_DETECT_ACTIVITY);
>  		set_mask_bits(&field_value, BMA400_INT_CONFIG0_GEN1_MASK,
>  			      FIELD_PREP(BMA400_INT_CONFIG0_GEN1_MASK, state));
>  		break;
>  	case IIO_EV_DIR_FALLING:
>  		reg = BMA400_GEN2INT_CONFIG0_REG;
>  		msk = BMA400_INT_CONFIG0_GEN2_MASK;
> -		value = 0;
> +		value = FIELD_PREP(BMA400_GENINT_CONFIG1_AXES_COMB_MASK, BMA400_EVAL_X_OR_Y_OR_Z) |
> +			FIELD_PREP(BMA400_GENINT_CONFIG1_DETCT_CRIT_MASK, BMA400_DETECT_INACTIVITY);
>  		set_mask_bits(&field_value, BMA400_INT_CONFIG0_GEN2_MASK,
>  			      FIELD_PREP(BMA400_INT_CONFIG0_GEN2_MASK, state));
>  		break;
> @@ -1182,7 +1184,13 @@ static int bma400_activity_event_en(struct bma400_data *data,
>  	}
>  
>  	/* Enabling all axis for interrupt evaluation */
> -	ret = regmap_write(data->regmap, reg, 0xF8);
> +	ret = regmap_write(data->regmap, reg,
> +			   BMA400_GENINT_CONFIG0_X_EN_MASK |
> +			   BMA400_GENINT_CONFIG0_Y_EN_MASK |
> +			   BMA400_GENINT_CONFIG0_Z_EN_MASK|
> +			   FIELD_PREP(BMA400_GENINT_CONFIG0_DATA_SRC_MASK, ACCEL_FILT2)|
> +			   FIELD_PREP(BMA400_GENINT_CONFIG0_REF_UPD_MODE_MASK,
> +				      BMA400_REF_EVERYTIME_UPDT_MODE));
>  	if (ret)
>  		return ret;
>
Re: [PATCH v3 2/5] iio: accel: bma400: Use macros for generic event configuration values
Posted by Akshay Jindal 4 months ago 
On Sat, Oct 4, 2025 at 6:28 PM Jonathan Cameron <jic23@kernel.org> wrote:
>
> On Fri,  3 Oct 2025 00:11:03 +0530
> Akshay Jindal <akshayaj.lkd@gmail.com> wrote:
>
> > Add macros and enums for configuration values used in generic event
> > handling for activity and inactivity detection. Replace hard-coded
> > values in activity_event_en() with the new definitions to make the
> > configuration explicit.
> >
> > No functional changes are intended.
> >
> > Signed-off-by: Akshay Jindal <akshayaj.lkd@gmail.com>
> > ---
> >  drivers/iio/accel/bma400.h      | 30 ++++++++++++++++++++++++++++++
> >  drivers/iio/accel/bma400_core.c | 14 +++++++++++---
> >  2 files changed, 41 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h
> > index ae3411c090c9..13fe2e5a3175 100644
> > --- a/drivers/iio/accel/bma400.h
> > +++ b/drivers/iio/accel/bma400.h
> > @@ -106,8 +106,38 @@
> >  #define BMA400_GEN1INT_CONFIG0_REG      0x3f
> >  #define BMA400_GEN2INT_CONFIG0_REG      0x4A
> >  #define BMA400_GENINT_CONFIG0_HYST_MASK              GENMASK(1, 0)
> > +#define BMA400_GENINT_CONFIG0_REF_UPD_MODE_MASK      GENMASK(3, 2)
> > +#define BMA400_GENINT_CONFIG0_DATA_SRC_MASK  BIT(4)
> > +#define BMA400_GENINT_CONFIG0_X_EN_MASK              BIT(5)
> > +#define BMA400_GENINT_CONFIG0_Y_EN_MASK              BIT(6)
> > +#define BMA400_GENINT_CONFIG0_Z_EN_MASK              BIT(7)
> > +
> > +enum bma400_accel_data_src {
> > +     ACCEL_FILT1,
> > +     ACCEL_FILT2,
> > +};
> > +
> > +enum bma400_ref_updt_mode {
> > +     BMA400_REF_MANUAL_UPDT_MODE,
> > +     BMA400_REF_ONETIME_UPDT_MODE,
> > +     BMA400_REF_EVERYTIME_UPDT_MODE,
> > +     BMA400_REF_EVERYTIME_LP_UPDT_MODE,
> > +};
> >
> >  #define BMA400_GEN_CONFIG1_OFF      0x01
> > +#define BMA400_GENINT_CONFIG1_AXES_COMB_MASK BIT(0)
> > +#define BMA400_GENINT_CONFIG1_DETCT_CRIT_MASK        BIT(1)
> > +
> > +enum bma400_genintr_acceleval_axescomb {
> > +     BMA400_EVAL_X_OR_Y_OR_Z,
> > +     BMA400_EVAL_X_AND_Y_AND_Z,
>
> An enum for potential field values only makes sense if you are going to
> use it as a type somewhere.  If not it is simpler to just
> use a define next to the mask for the field.  Also these should be named
> with prefixes that align with that mask.
> If you do use it as a type in future patches that's fine but the naming
> point still remains and you should specify values = 0, = 1 etc
> as they matter whereas implication of using an enum is that the actual
> values assigned doesn't matter.
>
> Same applies to the other enums introduced in here.
Assigned explicit values to enums in v4 patch series.

Thanks,
Akshay.
Re: [PATCH v3 2/5] iio: accel: bma400: Use macros for generic event configuration values
Posted by Jonathan Cameron 3 months, 4 weeks ago 
> > > +enum bma400_genintr_acceleval_axescomb {
> > > +     BMA400_EVAL_X_OR_Y_OR_Z,
> > > +     BMA400_EVAL_X_AND_Y_AND_Z,  
> >
> > An enum for potential field values only makes sense if you are going to
> > use it as a type somewhere.  If not it is simpler to just
> > use a define next to the mask for the field.  Also these should be named
> > with prefixes that align with that mask.
> > If you do use it as a type in future patches that's fine but the naming
> > point still remains and you should specify values = 0, = 1 etc
> > as they matter whereas implication of using an enum is that the actual
> > values assigned doesn't matter.
> >
> > Same applies to the other enums introduced in here.  
> Assigned explicit values to enums in v4 patch series.
> 
Hi Akshay,

Trivial process thing.  This email doesn't need to exist. Just
have the change called out in the change log for v4.  That way it
saves a bit of time for everyone.

Thanks,

Jonathan

> Thanks,
> Akshay.

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.