iio: mma8452: cleanup and freefall mode
v2 cover iio: mma8452: cleanup and freefall mode
This is v2 of cleanup and freefall detection for mma8452 devices.
[PATCH 1/3] iio: mma8452: remove unused register description [PATCH 2/3] iio: mma8452: use enum for channel index [PATCH 3/3] iio: mma8452: add freefall detection for Freescale's
If freefall mode (x&y&z falling event) is enabled, changes to individual (rising) axis events have no effect, keeping the state consistent to what values the user reads.
Other combinations (x&y, y&z, x&z) could be added later. x&y&z is by far the most useful one for freefall detection.
Of course this doesn't change anything for existing users.
revision history
----------------
v2: freefall channel idx -1, seperate enum patch, cleanup and fixes
thanks to Jonathan's review.
PATCH v2 1/3 iio: mma8452: remove unused register description
--- drivers/iio/accel/mma8452.c | 1 - 1 file changed, 1 deletion(-)
drivers/iio/accel/mma8452.c +0 -1
@@ -58,7 +58,6 @@#define MMA8452_FF_MT_COUNT 0x18#define MMA8452_TRANSIENT_CFG 0x1d#define MMA8452_TRANSIENT_CFG_HPF_BYP BIT(0) -#define MMA8452_TRANSIENT_CFG_CHAN (chan) BIT(chan + 1)#define MMA8452_TRANSIENT_CFG_ELE BIT(4)#define MMA8452_TRANSIENT_SRC 0x1e#define MMA8452_TRANSIENT_SRC_XTRANSE BIT(1)
Signature · 1 line
2.1.4
Jonathan Cameron
maintainerRe: [PATCH 1/3] iio: mma8452: remove unused register description
Quoted 2 lines · Martin Kepplinger
Signed-off-by Martin Kepplinger <[email protected]>Signed-off-by Christoph Muellner <[email protected]>
Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it.
J
Quoted 17 lines
--- drivers/iio/accel/mma8452.c | 1 - 1 file changed, 1 deletion(-)drivers/iio/accel/mma8452.c +0
-1@@ -58,7 +58,6 @@#define MMA8452_FF_MT_COUNT 0x18#define MMA8452_TRANSIENT_CFG 0x1d#define MMA8452_TRANSIENT_CFG_HPF_BYP BIT(0) -#define MMA8452_TRANSIENT_CFG_CHAN (chan) BIT(chan + 1)#define MMA8452_TRANSIENT_CFG_ELE BIT(4)#define MMA8452_TRANSIENT_SRC 0x1e#define MMA8452_TRANSIENT_SRC_XTRANSE BIT(1)
PATCH v2 2/3 iio: mma8452: use enum for channel index
In reply to Martin KepplingerThis gets rid of some magic numbers by adding an enum.
--- drivers/iio/accel/mma8452.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-)
drivers/iio/accel/mma8452.c +23 -16
@@ -143,6 +143,13 @@ struct mma_chip_info {u8 ev_count; }; +enum { + idx_x, + idx_y, + idx_z, + idx_ts, +}; +static int mma8452_drdy (struct mma8452_data *data) {int tries =150 ;
@@ -816,31 +823,31 @@ static struct attribute_group mma8452_event_attribute_group = { }static const struct iio_chan_spec mma8452_channels[] = { -MMA8452_CHANNEL (X ,0 ,12 ), -MMA8452_CHANNEL (Y ,1 ,12 ), -MMA8452_CHANNEL (Z ,2 ,12 ), -IIO_CHAN_SOFT_TIMESTAMP (3 ), +MMA8452_CHANNEL (X , idx_x,12 ), +MMA8452_CHANNEL (Y , idx_y,12 ), +MMA8452_CHANNEL (Z , idx_z,12 ), +IIO_CHAN_SOFT_TIMESTAMP (idx_ts), };static const struct iio_chan_spec mma8453_channels[] = { -MMA8452_CHANNEL (X ,0 ,10 ), -MMA8452_CHANNEL (Y ,1 ,10 ), -MMA8452_CHANNEL (Z ,2 ,10 ), -IIO_CHAN_SOFT_TIMESTAMP (3 ), +MMA8452_CHANNEL (X , idx_x,10 ), +MMA8452_CHANNEL (Y , idx_y,10 ), +MMA8452_CHANNEL (Z , idx_z,10 ), +IIO_CHAN_SOFT_TIMESTAMP (idx_ts), };static const struct iio_chan_spec mma8652_channels[] = { -MMA8652_CHANNEL (X ,0 ,12 ), -MMA8652_CHANNEL (Y ,1 ,12 ), -MMA8652_CHANNEL (Z ,2 ,12 ), -IIO_CHAN_SOFT_TIMESTAMP (3 ), +MMA8652_CHANNEL (X , idx_x,12 ), +MMA8652_CHANNEL (Y , idx_y,12 ), +MMA8652_CHANNEL (Z , idx_z,12 ), +IIO_CHAN_SOFT_TIMESTAMP (idx_ts), };static const struct iio_chan_spec mma8653_channels[] = { -MMA8652_CHANNEL (X ,0 ,10 ), -MMA8652_CHANNEL (Y ,1 ,10 ), -MMA8652_CHANNEL (Z ,2 ,10 ), -IIO_CHAN_SOFT_TIMESTAMP (3 ), +MMA8652_CHANNEL (X , idx_x,10 ), +MMA8652_CHANNEL (Y , idx_y,10 ), +MMA8652_CHANNEL (Z , idx_z,10 ), +IIO_CHAN_SOFT_TIMESTAMP (idx_ts), };enum {
Signature · 1 line
2.1.4
Jonathan Cameron
maintainerRe: [PATCH 2/3] iio: mma8452: use enum for channel index
Quoted 4 lines · Martin Kepplinger
This gets rid of some magic numbers by adding an enum.
Signed-off-by Martin Kepplinger <[email protected]>Signed-off-by Christoph Muellner <[email protected]>
Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it.
Thanks,
Jonathan
Quoted 71 lines
--- drivers/iio/accel/mma8452.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-)drivers/iio/accel/mma8452.c +23
-16@@ -143,6 +143,13 @@ struct mma_chip_info {u8 ev_count; }; +enum { + idx_x, + idx_y, + idx_z, + idx_ts, +}; +static int mma8452_drdy (struct mma8452_data *data) {int tries =150 ;@@ -816,31 +823,31 @@ static struct attribute_group mma8452_event_attribute_group = { }static const struct iio_chan_spec mma8452_channels[] = { -MMA8452_CHANNEL (X ,0 ,12 ), -MMA8452_CHANNEL (Y ,1 ,12 ), -MMA8452_CHANNEL (Z ,2 ,12 ), -IIO_CHAN_SOFT_TIMESTAMP (3 ), +MMA8452_CHANNEL (X , idx_x,12 ), +MMA8452_CHANNEL (Y , idx_y,12 ), +MMA8452_CHANNEL (Z , idx_z,12 ), +IIO_CHAN_SOFT_TIMESTAMP (idx_ts), };static const struct iio_chan_spec mma8453_channels[] = { -MMA8452_CHANNEL (X ,0 ,10 ), -MMA8452_CHANNEL (Y ,1 ,10 ), -MMA8452_CHANNEL (Z ,2 ,10 ), -IIO_CHAN_SOFT_TIMESTAMP (3 ), +MMA8452_CHANNEL (X , idx_x,10 ), +MMA8452_CHANNEL (Y , idx_y,10 ), +MMA8452_CHANNEL (Z , idx_z,10 ), +IIO_CHAN_SOFT_TIMESTAMP (idx_ts), };static const struct iio_chan_spec mma8652_channels[] = { -MMA8652_CHANNEL (X ,0 ,12 ), -MMA8652_CHANNEL (Y ,1 ,12 ), -MMA8652_CHANNEL (Z ,2 ,12 ), -IIO_CHAN_SOFT_TIMESTAMP (3 ), +MMA8652_CHANNEL (X , idx_x,12 ), +MMA8652_CHANNEL (Y , idx_y,12 ), +MMA8652_CHANNEL (Z , idx_z,12 ), +IIO_CHAN_SOFT_TIMESTAMP (idx_ts), };static const struct iio_chan_spec mma8653_channels[] = { -MMA8652_CHANNEL (X ,0 ,10 ), -MMA8652_CHANNEL (Y ,1 ,10 ), -MMA8652_CHANNEL (Z ,2 ,10 ), -IIO_CHAN_SOFT_TIMESTAMP (3 ), +MMA8652_CHANNEL (X , idx_x,10 ), +MMA8652_CHANNEL (Y , idx_y,10 ), +MMA8652_CHANNEL (Z , idx_z,10 ), +IIO_CHAN_SOFT_TIMESTAMP (idx_ts), };enum {
PATCH v2 3/3 iio: mma8452: add freefall detection for Freescale's accelerometers
In reply to Martin KepplingerThis adds freefall event detection to the supported devices. It adds the in_accel_x&y&z_mag_falling_en iio event attribute, which activates freefall mode.
In freefall mode, the current acceleration magnitude (AND combination of all axis values) is compared to the specified threshold. If it falls under the threshold (in_accel_mag_falling_value), the appropriate IIO event code is generated.
The values of rising and falling versions of various sysfs files are shared, which is compliant to the IIO specification.
This is what the sysfs "events" directory for these devices looks like after this change:
-rw-r--r-- 4096 Oct 23 08:45 in_accel_mag_falling_period -rw-r--r-- 4096 Oct 23 08:45 in_accel_mag_falling_value -rw-r--r-- 4096 Oct 23 08:45 in_accel_mag_rising_period -rw-r--r-- 4096 Oct 23 08:45 in_accel_mag_rising_value -r--r--r-- 4096 Oct 23 08:45 in_accel_scale -rw-r--r-- 4096 Oct 23 08:45 in_accel_x&y&z_mag_falling_en -rw-r--r-- 4096 Oct 23 08:45 in_accel_x_mag_rising_en -rw-r--r-- 4096 Oct 23 08:45 in_accel_y_mag_rising_en -rw-r--r-- 4096 Oct 23 08:45 in_accel_z_mag_rising_en
--- drivers/iio/accel/mma8452.c | 113 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-)
drivers/iio/accel/mma8452.c +111 -2
@@ -15,7 +15,7 @@* * 7-bit I2C slave address 0x1c/0x1d (pin selectable) * -* TODO: orientation / freefall events, autosleep +* TODO: orientation events, autosleep */ #include <linux/module.h>
@@ -416,6 +416,46 @@ fail:return ret; } +static int mma8452_freefall_mode_enabled (struct mma8452_data *data) +{ +int val; +const struct mma_chip_info *chip = data->chip_info; + + val =i2c_smbus_read_byte_data (data->client, chip->ev_cfg); +if (val <0 ) +return val; + +return !(val &MMA8452_FF_MT_CFG_OAE ); +} + +static int mma8452_set_freefall_mode (struct mma8452_data *data,u8 state) +{ +int val, ret; +const struct mma_chip_info *chip = data->chip_info; + + val =i2c_smbus_read_byte_data (data->client, chip->ev_cfg); +if (val <0 ) +return val; + +if (state && !(mma8452_freefall_mode_enabled (data))) { + val |=BIT (idx_x + chip->ev_cfg_chan_shift); + val |=BIT (idx_y + chip->ev_cfg_chan_shift); + val |=BIT (idx_z + chip->ev_cfg_chan_shift); + val &= ~MMA8452_FF_MT_CFG_OAE ; + }else if (!state &&mma8452_freefall_mode_enabled (data)) { + val &= ~BIT (idx_x + chip->ev_cfg_chan_shift); + val &= ~BIT (idx_y + chip->ev_cfg_chan_shift); + val &= ~BIT (idx_z + chip->ev_cfg_chan_shift); + val |=MMA8452_FF_MT_CFG_OAE ; + } + + ret =mma8452_change_config (data, chip->ev_cfg, val); +if (ret) +return ret; + +return 0 ; +} +static int mma8452_set_hp_filter_frequency (struct mma8452_data *data,int val,int val2) {
@@ -609,6 +649,11 @@ static int mma8452_read_event_config(struct iio_dev *indio_dev,const struct mma_chip_info *chip = data->chip_info;int ret; +switch (chan->channel2) { +case IIO_MOD_X_AND_Y_AND_Z : +return mma8452_freefall_mode_enabled (data); + } + ret =i2c_smbus_read_byte_data (data->client, data->chip_info->ev_cfg);if (ret <0 )
@@ -627,6 +672,14 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev,const struct mma_chip_info *chip = data->chip_info;int val; +switch (chan->channel2) { +case IIO_MOD_X_AND_Y_AND_Z : +return mma8452_set_freefall_mode (data, state); +default : +if (mma8452_freefall_mode_enabled (data)) +return 0 ; + } + val =i2c_smbus_read_byte_data (data->client, chip->ev_cfg);if (val <0 )return val;
@@ -637,7 +690,6 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev, val &= ~BIT (chan->scan_index + chip->ev_cfg_chan_shift); val |= chip->ev_cfg_ele; - val |=MMA8452_FF_MT_CFG_OAE ;return mma8452_change_config (data, chip->ev_cfg, val); }
@@ -652,6 +704,16 @@ static void mma8452_transient_interrupt(struct iio_dev *indio_dev)if (src <0 )return ; +if (mma8452_freefall_mode_enabled (data)) { +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); +return ; + } +if (src & data->chip_info->ev_src_xe) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_X,
@@ -745,6 +807,27 @@ static int mma8452_reg_access_dbg(struct iio_dev *indio_dev,return 0 ; } +static const struct iio_event_spec mma8452_freefall_event[] = { + { + .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 ) | +BIT (IIO_EV_INFO_HIGH_PASS_FILTER_3DB ) + }, +}; + +static const struct iio_event_spec mma8652_freefall_event[] = { + { + .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 ) + }, +}; +static const struct iio_event_spec mma8452_transient_event[] = { { .type =IIO_EV_TYPE_MAG ,
@@ -781,6 +864,24 @@ static struct attribute_group mma8452_event_attribute_group = { .attrs = mma8452_event_attributes, }; +#define MMA8452_FREEFALL_CHANNEL (modifier) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = modifier, \ + .scan_index = -1, \ + .event_spec = mma8452_freefall_event, \ + .num_event_specs = ARRAY_SIZE(mma8452_freefall_event), \ +} + +#define MMA8652_FREEFALL_CHANNEL (modifier) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = modifier, \ + .scan_index = -1, \ + .event_spec = mma8652_freefall_event, \ + .num_event_specs = ARRAY_SIZE(mma8652_freefall_event), \ +} +#define MMA8452_CHANNEL (axis, idx, bits) { \ .type = IIO_ACCEL, \ .modified = 1, \
@@ -827,6 +928,7 @@ static const struct iio_chan_spec mma8452_channels[] = {MMA8452_CHANNEL (Y , idx_y,12 ),MMA8452_CHANNEL (Z , idx_z,12 ),IIO_CHAN_SOFT_TIMESTAMP (idx_ts), + MMA8452_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), }; static const struct iio_chan_spec mma8453_channels[] = {
@@ -834,6 +936,7 @@ static const struct iio_chan_spec mma8453_channels[] = {MMA8452_CHANNEL (Y , idx_y,10 ),MMA8452_CHANNEL (Z , idx_z,10 ),IIO_CHAN_SOFT_TIMESTAMP (idx_ts), + MMA8452_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), }; static const struct iio_chan_spec mma8652_channels[] = {
@@ -841,6 +944,7 @@ static const struct iio_chan_spec mma8652_channels[] = {MMA8652_CHANNEL (Y , idx_y,12 ),MMA8652_CHANNEL (Z , idx_z,12 ),IIO_CHAN_SOFT_TIMESTAMP (idx_ts), + MMA8652_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), }; static const struct iio_chan_spec mma8653_channels[] = {
@@ -848,6 +952,7 @@ static const struct iio_chan_spec mma8653_channels[] = {MMA8652_CHANNEL (Y , idx_y,10 ),MMA8652_CHANNEL (Z , idx_z,10 ),IIO_CHAN_SOFT_TIMESTAMP (idx_ts), + MMA8652_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), }; enum {
@@ -1190,6 +1295,10 @@ static int mma8452_probe(struct i2c_client *client,if (ret <0 ) goto buffer_cleanup; + ret =mma8452_set_freefall_mode (data,0 ); +if (ret) +return ret; +return 0 ; buffer_cleanup:
Signature · 1 line
2.1.4
Jonathan Cameron
maintainerRe: [PATCH 3/3] iio: mma8452: add freefall detection for Freescale's accelerometers
Quoted 25 lines · Martin Kepplinger
This adds freefall event detection to the supported devices. It adds the in_accel_x&y&z_mag_falling_en iio event attribute, which activates freefall mode.
In freefall mode, the current acceleration magnitude (AND combination of all axis values) is compared to the specified threshold. If it falls under the threshold (
in_accel_mag_falling_value), the appropriate IIO event code is generated.The values of rising and falling versions of various sysfs files are shared, which is compliant to the IIO specification.
This is what the sysfs "events" directory for these devices looks like after this change:
(quoted diff) +0
-9-rw-r--r-- 4096 Oct 23 08:45 in_accel_mag_falling_period -rw-r--r-- 4096 Oct 23 08:45 in_accel_mag_falling_value -rw-r--r-- 4096 Oct 23 08:45 in_accel_mag_rising_period -rw-r--r-- 4096 Oct 23 08:45 in_accel_mag_rising_value -r--r--r-- 4096 Oct 23 08:45 in_accel_scale -rw-r--r-- 4096 Oct 23 08:45 in_accel_x&y&z_mag_falling_en -rw-r--r-- 4096 Oct 23 08:45 in_accel_x_mag_rising_en -rw-r--r-- 4096 Oct 23 08:45 in_accel_y_mag_rising_en -rw-r--r-- 4096 Oct 23 08:45 in_accel_z_mag_rising_en
Quoted 2 lines
Signed-off-by Martin Kepplinger <[email protected]>Signed-off-by Christoph Muellner <[email protected]>
I didn't explain myself clearly enough in the last review.
My issue was that if freefall is enabled, any query of whether the mag_rising values are enabled will I think return true when they aren't.
Few more bits inline as well. In particularly I'd like the 'priority' of all events to be treated as equal. So the last event enabled will disable other incompatible events if it needs to. Alternative is to reject any incompatible event sets. I don't like the current option where the freefall event is considered higher priority than the others and will effectively always win any clash.
Jonathan
Quoted 65 lines
--- drivers/iio/accel/mma8452.c | 113 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-)drivers/iio/accel/mma8452.c +41
-1@@ -15,7 +15,7 @@* * 7-bit I2C slave address 0x1c/0x1d (pin selectable) * -* TODO: orientation / freefall events, autosleep +* TODO: orientation events, autosleep */ #include <linux/module.h> @@ -416,6 +416,46 @@ fail:return ret; } +static int mma8452_freefall_mode_enabled (struct mma8452_data *data) +{ +int val; +const struct mma_chip_info *chip = data->chip_info; + + val =i2c_smbus_read_byte_data (data->client, chip->ev_cfg); +if (val <0 ) +return val; + +return !(val &MMA8452_FF_MT_CFG_OAE ); +} + +static int mma8452_set_freefall_mode (struct mma8452_data *data,u8 state) +{ +int val, ret; +const struct mma_chip_info *chip = data->chip_info; + + val =i2c_smbus_read_byte_data (data->client, chip->ev_cfg); +if (val <0 ) +return val; + +if (state && !(mma8452_freefall_mode_enabled (data))) { + val |=BIT (idx_x + chip->ev_cfg_chan_shift); + val |=BIT (idx_y + chip->ev_cfg_chan_shift); + val |=BIT (idx_z + chip->ev_cfg_chan_shift); + val &= ~MMA8452_FF_MT_CFG_OAE ; + }else if (!state &&mma8452_freefall_mode_enabled (data)) { + val &= ~BIT (idx_x + chip->ev_cfg_chan_shift); + val &= ~BIT (idx_y + chip->ev_cfg_chan_shift); + val &= ~BIT (idx_z + chip->ev_cfg_chan_shift); + val |=MMA8452_FF_MT_CFG_OAE ; + } + + ret =mma8452_change_config (data, chip->ev_cfg, val); +if (ret) +return ret; + +return 0 ; +} +static int mma8452_set_hp_filter_frequency (struct mma8452_data *data,int val,int val2) {
drivers/iio/accel/mma8452.c static int mma8452_read_event_config(struct iio_dev *indio_dev, · line 656
Quoted 8 lines
drivers/iio/accel/mma8452.c +5
-0@@ -609,6 +649,11 @@ static int mma8452_read_event_config(struct iio_dev *indio_dev,const struct mma_chip_info *chip = data->chip_info;int ret; +switch (chan->channel2) { +case IIO_MOD_X_AND_Y_AND_Z : +return mma8452_freefall_mode_enabled (data); + } +
If in freefall mode and queried we indeed return true. However, if in freefall mode and we query if we are in rising for a single channel... I think it will always return that the rising event is also enabled when it isn't (as we are in freefall mode)
I think you need to confirm that we are not in freefall mode before doing the axis checks that follow which are for the rising case.
The ABI allows the write of any element to change the value of any other (thus it's fine to have enabling freefall mode turn off the rising events) but if the other values are read back they must then reflect the new state so userspace can find out what happened.
drivers/iio/accel/mma8452.c static int mma8452_write_event_config(struct iio_dev *indio_dev, · line 679
Quoted 12 lines
drivers/iio/accel/mma8452.c +5
-0ret =i2c_smbus_read_byte_data (data->client, data->chip_info->ev_cfg);if (ret <0 )@@ -627,6 +672,14 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev,const struct mma_chip_info *chip = data->chip_info;int val; +switch (chan->channel2) { +case IIO_MOD_X_AND_Y_AND_Z : +return mma8452_set_freefall_mode (data, state); +default : +if (mma8452_freefall_mode_enabled (data))
I'd rather this was all symmetric. So if another event is enabled free fall mode should then be disabled. In any case this should return an error code to reflect what has happened (-EBUSY)
Quoted 128 lines
drivers/iio/accel/mma8452.c +60
-1+return 0 ; + } + val =i2c_smbus_read_byte_data (data->client, chip->ev_cfg);if (val <0 )return val;@@ -637,7 +690,6 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev, val &= ~BIT (chan->scan_index + chip->ev_cfg_chan_shift); val |= chip->ev_cfg_ele; - val |=MMA8452_FF_MT_CFG_OAE ;return mma8452_change_config (data, chip->ev_cfg, val); }@@ -652,6 +704,16 @@ static void mma8452_transient_interrupt(struct iio_dev *indio_dev)if (src <0 )return ; +if (mma8452_freefall_mode_enabled (data)) { +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); +return ; + } +if (src & data->chip_info->ev_src_xe) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_X,@@ -745,6 +807,27 @@ static int mma8452_reg_access_dbg(struct iio_dev *indio_dev,return 0 ; } +static const struct iio_event_spec mma8452_freefall_event[] = { + { + .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 ) | +BIT (IIO_EV_INFO_HIGH_PASS_FILTER_3DB ) + }, +}; + +static const struct iio_event_spec mma8652_freefall_event[] = { + { + .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 ) + }, +}; +static const struct iio_event_spec mma8452_transient_event[] = { { .type =IIO_EV_TYPE_MAG ,@@ -781,6 +864,24 @@ static struct attribute_group mma8452_event_attribute_group = { .attrs = mma8452_event_attributes, }; +#define MMA8452_FREEFALL_CHANNEL (modifier) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = modifier, \ + .scan_index = -1, \ + .event_spec = mma8452_freefall_event, \ + .num_event_specs = ARRAY_SIZE(mma8452_freefall_event), \ +} + +#define MMA8652_FREEFALL_CHANNEL (modifier) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = modifier, \ + .scan_index = -1, \ + .event_spec = mma8652_freefall_event, \ + .num_event_specs = ARRAY_SIZE(mma8652_freefall_event), \ +} +#define MMA8452_CHANNEL (axis, idx, bits) { \ .type = IIO_ACCEL, \ .modified = 1, \@@ -827,6 +928,7 @@ static const struct iio_chan_spec mma8452_channels[] = {MMA8452_CHANNEL (Y , idx_y,12 ),MMA8452_CHANNEL (Z , idx_z,12 ),IIO_CHAN_SOFT_TIMESTAMP (idx_ts), + MMA8452_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), }; static const struct iio_chan_spec mma8453_channels[] = {@@ -834,6 +936,7 @@ static const struct iio_chan_spec mma8453_channels[] = {MMA8452_CHANNEL (Y , idx_y,10 ),MMA8452_CHANNEL (Z , idx_z,10 ),IIO_CHAN_SOFT_TIMESTAMP (idx_ts), + MMA8452_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), }; static const struct iio_chan_spec mma8652_channels[] = {@@ -841,6 +944,7 @@ static const struct iio_chan_spec mma8652_channels[] = {MMA8652_CHANNEL (Y , idx_y,12 ),MMA8652_CHANNEL (Z , idx_z,12 ),IIO_CHAN_SOFT_TIMESTAMP (idx_ts), + MMA8652_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), }; static const struct iio_chan_spec mma8653_channels[] = {@@ -848,6 +952,7 @@ static const struct iio_chan_spec mma8653_channels[] = {MMA8652_CHANNEL (Y , idx_y,10 ),MMA8652_CHANNEL (Z , idx_z,10 ),IIO_CHAN_SOFT_TIMESTAMP (idx_ts), + MMA8652_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), }; enum {@@ -1190,6 +1295,10 @@ static int mma8452_probe(struct i2c_client *client,if (ret <0 ) goto buffer_cleanup; + ret =mma8452_set_freefall_mode (data,0 ); +if (ret) +return ret; +return 0 ; buffer_cleanup: