* iio: mma8452: driver improvements for v4.6
@ 2016-01-16 14:35 Martin Kepplinger
2016-01-16 14:35 ` [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers Martin Kepplinger
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Martin Kepplinger @ 2016-01-16 14:35 UTC (permalink / raw)
To: jic23, knaack.h, lars, pmeerw, christoph.muellner, mfuzzey
Cc: linux-iio, linux-kernel
This includes my pending changes for the mma8452 driver for v4.6.
It hopefully makes the auto builder happy and simplifies the thing
on the mailing lists.
[PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's
[PATCH 2/3] iio: mma8452: whitespace cleanup
[PATCH 3/3] iio: mma8452: add support for MMA8451Q
Strictly this is v2, after Peter's and Jonathan's review.
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers 2016-01-16 14:35 iio: mma8452: driver improvements for v4.6 Martin Kepplinger @ 2016-01-16 14:35 ` Martin Kepplinger 2016-01-22 17:13 ` Martin Kepplinger 2016-01-23 16:28 ` Jonathan Cameron 2016-01-16 14:35 ` [PATCH 2/3] iio: mma8452: whitespace cleanup Martin Kepplinger 2016-01-16 14:35 ` [PATCH 3/3] iio: mma8452: add support for MMA8451Q Martin Kepplinger 2 siblings, 2 replies; 8+ messages in thread From: Martin Kepplinger @ 2016-01-16 14:35 UTC (permalink / raw) To: jic23, knaack.h, lars, pmeerw, christoph.muellner, mfuzzey Cc: linux-iio, linux-kernel, Martin Kepplinger, 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. 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 Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> --- revision history ---------------- v1: initial post v2: build all from correct event and channel spec structs v3: rising and falling are treated as equal now. Until last time, I had misunderstood the iio events' user API definition. This works and values always reflect the current state of operation. v4: fix error that caused a build warning v5: changes according to Peter's review v6: changes according to Jonathan's review: improve set_freefall_mode(); fix error case drivers/iio/accel/mma8452.c | 160 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 144 insertions(+), 16 deletions(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index ccc632a..77b71c2 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -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,51 @@ fail: return ret; } +/* returns >0 if in freefall mode, 0 if not or <0 if an error occured */ +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, bool state) +{ + int val; + const struct mma_chip_info *chip = data->chip_info; + + if ((state && mma8452_freefall_mode_enabled(data)) || + (!state && !(mma8452_freefall_mode_enabled(data)))) + return 0; + + val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg); + if (val < 0) + return val; + + if (state) { + 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 { + 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; + } + + val = mma8452_change_config(data, chip->ev_cfg, val); + if (val) + return val; + + return 0; +} + static int mma8452_set_hp_filter_frequency(struct mma8452_data *data, int val, int val2) { @@ -609,12 +654,22 @@ static int mma8452_read_event_config(struct iio_dev *indio_dev, const struct mma_chip_info *chip = data->chip_info; int ret; - ret = i2c_smbus_read_byte_data(data->client, - data->chip_info->ev_cfg); - if (ret < 0) - return ret; + switch (dir) { + case IIO_EV_DIR_FALLING: + return mma8452_freefall_mode_enabled(data); + case IIO_EV_DIR_RISING: + if (mma8452_freefall_mode_enabled(data)) + return 0; + + ret = i2c_smbus_read_byte_data(data->client, + data->chip_info->ev_cfg); + if (ret < 0) + return ret; - return !!(ret & BIT(chan->scan_index + chip->ev_cfg_chan_shift)); + return !!(ret & BIT(chan->scan_index + chip->ev_cfg_chan_shift)); + default: + return -EINVAL; + } } static int mma8452_write_event_config(struct iio_dev *indio_dev, @@ -627,19 +682,35 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev, const struct mma_chip_info *chip = data->chip_info; int val; - val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg); - if (val < 0) - return val; + switch (dir) { + case IIO_EV_DIR_FALLING: + return mma8452_set_freefall_mode(data, state); + case IIO_EV_DIR_RISING: + val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg); + if (val < 0) + return val; + + if (state) { + if (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; + } + val |= BIT(chan->scan_index + chip->ev_cfg_chan_shift); + } else { + if (mma8452_freefall_mode_enabled(data)) + return 0; - if (state) - val |= BIT(chan->scan_index + chip->ev_cfg_chan_shift); - else - val &= ~BIT(chan->scan_index + chip->ev_cfg_chan_shift); + val &= ~BIT(chan->scan_index + chip->ev_cfg_chan_shift); + } - val |= chip->ev_cfg_ele; - val |= MMA8452_FF_MT_CFG_OAE; + val |= chip->ev_cfg_ele; - return mma8452_change_config(data, chip->ev_cfg, val); + return mma8452_change_config(data, chip->ev_cfg, val); + default: + return -EINVAL; + } } static void mma8452_transient_interrupt(struct iio_dev *indio_dev) @@ -652,6 +723,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 +826,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 +883,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 +947,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 +955,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 +963,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 +971,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 +1314,10 @@ static int mma8452_probe(struct i2c_client *client, if (ret < 0) goto buffer_cleanup; + ret = mma8452_set_freefall_mode(data, false); + if (ret) + return ret; + return 0; buffer_cleanup: -- 2.1.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers 2016-01-16 14:35 ` [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers Martin Kepplinger @ 2016-01-22 17:13 ` Martin Kepplinger 2016-01-23 16:28 ` Jonathan Cameron 1 sibling, 0 replies; 8+ messages in thread From: Martin Kepplinger @ 2016-01-22 17:13 UTC (permalink / raw) To: jic23, knaack.h, lars, pmeerw, christoph.muellner, mfuzzey Cc: linux-iio, linux-kernel, Martin Kepplinger Am 2016-01-16 um 15:35 schrieb 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. > > 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 > > Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com> > Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> > --- > revision history > ---------------- > v1: > initial post > v2: > build all from correct event and channel spec structs > v3: > rising and falling are treated as equal now. Until last time, I had > misunderstood the iio events' user API definition. This works and > values always reflect the current state of operation. > v4: > fix error that caused a build warning > v5: > changes according to Peter's review > v6: > changes according to Jonathan's review: > improve set_freefall_mode(); fix error case > > Any more thoughts, advice or objections on this? thanks martin ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers 2016-01-16 14:35 ` [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers Martin Kepplinger 2016-01-22 17:13 ` Martin Kepplinger @ 2016-01-23 16:28 ` Jonathan Cameron 1 sibling, 0 replies; 8+ messages in thread From: Jonathan Cameron @ 2016-01-23 16:28 UTC (permalink / raw) To: Martin Kepplinger, knaack.h, lars, pmeerw, christoph.muellner, mfuzzey Cc: linux-iio, linux-kernel, Martin Kepplinger On 16/01/16 14:35, Martin Kepplinger wrote: > 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. > > 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 > > Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com> > Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > revision history > ---------------- > v1: > initial post > v2: > build all from correct event and channel spec structs > v3: > rising and falling are treated as equal now. Until last time, I had > misunderstood the iio events' user API definition. This works and > values always reflect the current state of operation. > v4: > fix error that caused a build warning > v5: > changes according to Peter's review > v6: > changes according to Jonathan's review: > improve set_freefall_mode(); fix error case > > > drivers/iio/accel/mma8452.c | 160 +++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 144 insertions(+), 16 deletions(-) > > diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c > index ccc632a..77b71c2 100644 > --- a/drivers/iio/accel/mma8452.c > +++ b/drivers/iio/accel/mma8452.c > @@ -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,51 @@ fail: > return ret; > } > > +/* returns >0 if in freefall mode, 0 if not or <0 if an error occured */ > +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, bool state) > +{ > + int val; > + const struct mma_chip_info *chip = data->chip_info; > + > + if ((state && mma8452_freefall_mode_enabled(data)) || > + (!state && !(mma8452_freefall_mode_enabled(data)))) > + return 0; > + > + val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg); > + if (val < 0) > + return val; > + > + if (state) { > + 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 { > + 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; > + } > + > + val = mma8452_change_config(data, chip->ev_cfg, val); > + if (val) > + return val; > + > + return 0; > +} > + > static int mma8452_set_hp_filter_frequency(struct mma8452_data *data, > int val, int val2) > { > @@ -609,12 +654,22 @@ static int mma8452_read_event_config(struct iio_dev *indio_dev, > const struct mma_chip_info *chip = data->chip_info; > int ret; > > - ret = i2c_smbus_read_byte_data(data->client, > - data->chip_info->ev_cfg); > - if (ret < 0) > - return ret; > + switch (dir) { > + case IIO_EV_DIR_FALLING: > + return mma8452_freefall_mode_enabled(data); > + case IIO_EV_DIR_RISING: > + if (mma8452_freefall_mode_enabled(data)) > + return 0; > + > + ret = i2c_smbus_read_byte_data(data->client, > + data->chip_info->ev_cfg); > + if (ret < 0) > + return ret; > > - return !!(ret & BIT(chan->scan_index + chip->ev_cfg_chan_shift)); > + return !!(ret & BIT(chan->scan_index + chip->ev_cfg_chan_shift)); > + default: > + return -EINVAL; > + } > } > > static int mma8452_write_event_config(struct iio_dev *indio_dev, > @@ -627,19 +682,35 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev, > const struct mma_chip_info *chip = data->chip_info; > int val; > > - val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg); > - if (val < 0) > - return val; > + switch (dir) { > + case IIO_EV_DIR_FALLING: > + return mma8452_set_freefall_mode(data, state); > + case IIO_EV_DIR_RISING: > + val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg); > + if (val < 0) > + return val; > + > + if (state) { > + if (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; > + } > + val |= BIT(chan->scan_index + chip->ev_cfg_chan_shift); > + } else { > + if (mma8452_freefall_mode_enabled(data)) > + return 0; > > - if (state) > - val |= BIT(chan->scan_index + chip->ev_cfg_chan_shift); > - else > - val &= ~BIT(chan->scan_index + chip->ev_cfg_chan_shift); > + val &= ~BIT(chan->scan_index + chip->ev_cfg_chan_shift); > + } > > - val |= chip->ev_cfg_ele; > - val |= MMA8452_FF_MT_CFG_OAE; > + val |= chip->ev_cfg_ele; > > - return mma8452_change_config(data, chip->ev_cfg, val); > + return mma8452_change_config(data, chip->ev_cfg, val); > + default: > + return -EINVAL; > + } > } > > static void mma8452_transient_interrupt(struct iio_dev *indio_dev) > @@ -652,6 +723,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 +826,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 +883,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 +947,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 +955,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 +963,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 +971,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 +1314,10 @@ static int mma8452_probe(struct i2c_client *client, > if (ret < 0) > goto buffer_cleanup; > > + ret = mma8452_set_freefall_mode(data, false); > + if (ret) > + return ret; > + > return 0; > > buffer_cleanup: > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] iio: mma8452: whitespace cleanup 2016-01-16 14:35 iio: mma8452: driver improvements for v4.6 Martin Kepplinger 2016-01-16 14:35 ` [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers Martin Kepplinger @ 2016-01-16 14:35 ` Martin Kepplinger 2016-01-23 16:28 ` Jonathan Cameron 2016-01-16 14:35 ` [PATCH 3/3] iio: mma8452: add support for MMA8451Q Martin Kepplinger 2 siblings, 1 reply; 8+ messages in thread From: Martin Kepplinger @ 2016-01-16 14:35 UTC (permalink / raw) To: jic23, knaack.h, lars, pmeerw, christoph.muellner, mfuzzey Cc: linux-iio, linux-kernel, Martin Kepplinger, Martin Kepplinger Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> --- drivers/iio/accel/mma8452.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 77b71c2..843169e 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -85,8 +85,8 @@ #define MMA8452_INT_FF_MT BIT(2) #define MMA8452_INT_TRANS BIT(5) -#define MMA8452_DEVICE_ID 0x2a -#define MMA8453_DEVICE_ID 0x3a +#define MMA8452_DEVICE_ID 0x2a +#define MMA8453_DEVICE_ID 0x3a #define MMA8652_DEVICE_ID 0x4a #define MMA8653_DEVICE_ID 0x5a -- 2.1.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] iio: mma8452: whitespace cleanup 2016-01-16 14:35 ` [PATCH 2/3] iio: mma8452: whitespace cleanup Martin Kepplinger @ 2016-01-23 16:28 ` Jonathan Cameron 0 siblings, 0 replies; 8+ messages in thread From: Jonathan Cameron @ 2016-01-23 16:28 UTC (permalink / raw) To: Martin Kepplinger, knaack.h, lars, pmeerw, christoph.muellner, mfuzzey Cc: linux-iio, linux-kernel, Martin Kepplinger On 16/01/16 14:35, Martin Kepplinger wrote: > Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com> > Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> Applied. > --- > drivers/iio/accel/mma8452.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c > index 77b71c2..843169e 100644 > --- a/drivers/iio/accel/mma8452.c > +++ b/drivers/iio/accel/mma8452.c > @@ -85,8 +85,8 @@ > #define MMA8452_INT_FF_MT BIT(2) > #define MMA8452_INT_TRANS BIT(5) > > -#define MMA8452_DEVICE_ID 0x2a > -#define MMA8453_DEVICE_ID 0x3a > +#define MMA8452_DEVICE_ID 0x2a > +#define MMA8453_DEVICE_ID 0x3a > #define MMA8652_DEVICE_ID 0x4a > #define MMA8653_DEVICE_ID 0x5a > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] iio: mma8452: add support for MMA8451Q 2016-01-16 14:35 iio: mma8452: driver improvements for v4.6 Martin Kepplinger 2016-01-16 14:35 ` [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers Martin Kepplinger 2016-01-16 14:35 ` [PATCH 2/3] iio: mma8452: whitespace cleanup Martin Kepplinger @ 2016-01-16 14:35 ` Martin Kepplinger 2016-01-23 16:29 ` Jonathan Cameron 2 siblings, 1 reply; 8+ messages in thread From: Martin Kepplinger @ 2016-01-16 14:35 UTC (permalink / raw) To: jic23, knaack.h, lars, pmeerw, christoph.muellner, mfuzzey Cc: linux-iio, linux-kernel, Martin Kepplinger, Martin Kepplinger This adds support for this series' 14 bit accelerometer chip, MMA8451Q. It's datasheet is available at the vendor's website: https://cache.freescale.com/files/sensors/doc/data_sheet/MMA8451Q.pdf Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> --- .../devicetree/bindings/iio/accel/mma8452.txt | 4 ++- drivers/iio/accel/Kconfig | 2 +- drivers/iio/accel/mma8452.c | 42 ++++++++++++++++++---- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/iio/accel/mma8452.txt b/Documentation/devicetree/bindings/iio/accel/mma8452.txt index 3c10e85..165937e 100644 --- a/Documentation/devicetree/bindings/iio/accel/mma8452.txt +++ b/Documentation/devicetree/bindings/iio/accel/mma8452.txt @@ -1,8 +1,10 @@ -Freescale MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC triaxial accelerometer +Freescale MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC +triaxial accelerometer Required properties: - compatible: should contain one of + * "fsl,mma8451" * "fsl,mma8452" * "fsl,mma8453" * "fsl,mma8652" diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index edc29b1..d9feaa3 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -143,7 +143,7 @@ config MMA8452 select IIO_TRIGGERED_BUFFER help Say yes here to build support for the following Freescale 3-axis - accelerometers: MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC. + accelerometers: MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC. To compile this driver as a module, choose M here: the module will be called mma8452. diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 843169e..7f4994f 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -1,6 +1,7 @@ /* * mma8452.c - Support for following Freescale 3-axis accelerometers: * + * MMA8451Q (14 bit) * MMA8452Q (12 bit) * MMA8453Q (10 bit) * MMA8652FC (12 bit) @@ -85,6 +86,7 @@ #define MMA8452_INT_FF_MT BIT(2) #define MMA8452_INT_TRANS BIT(5) +#define MMA8451_DEVICE_ID 0x1a #define MMA8452_DEVICE_ID 0x2a #define MMA8453_DEVICE_ID 0x3a #define MMA8652_DEVICE_ID 0x4a @@ -942,6 +944,14 @@ static struct attribute_group mma8452_event_attribute_group = { .num_event_specs = ARRAY_SIZE(mma8452_motion_event), \ } +static const struct iio_chan_spec mma8451_channels[] = { + MMA8452_CHANNEL(X, idx_x, 14), + MMA8452_CHANNEL(Y, idx_y, 14), + MMA8452_CHANNEL(Z, idx_z, 14), + IIO_CHAN_SOFT_TIMESTAMP(idx_ts), + MMA8452_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), +}; + static const struct iio_chan_spec mma8452_channels[] = { MMA8452_CHANNEL(X, idx_x, 12), MMA8452_CHANNEL(Y, idx_y, 12), @@ -975,6 +985,7 @@ static const struct iio_chan_spec mma8653_channels[] = { }; enum { + mma8451, mma8452, mma8453, mma8652, @@ -982,17 +993,34 @@ enum { }; static const struct mma_chip_info mma_chip_info_table[] = { - [mma8452] = { - .chip_id = MMA8452_DEVICE_ID, - .channels = mma8452_channels, - .num_channels = ARRAY_SIZE(mma8452_channels), + [mma8451] = { + .chip_id = MMA8451_DEVICE_ID, + .channels = mma8451_channels, + .num_channels = ARRAY_SIZE(mma8451_channels), /* * Hardware has fullscale of -2G, -4G, -8G corresponding to - * raw value -2048 for 12 bit or -512 for 10 bit. + * raw value -8192 for 14 bit, -2048 for 12 bit or -512 for 10 + * bit. * The userspace interface uses m/s^2 and we declare micro units * So scale factor for 12 bit here is given by: - * g * N * 1000000 / 2048 for N = 2, 4, 8 and g=9.80665 + * g * N * 1000000 / 2048 for N = 2, 4, 8 and g=9.80665 */ + .mma_scales = { {0, 2394}, {0, 4788}, {0, 9577} }, + .ev_cfg = MMA8452_TRANSIENT_CFG, + .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE, + .ev_cfg_chan_shift = 1, + .ev_src = MMA8452_TRANSIENT_SRC, + .ev_src_xe = MMA8452_TRANSIENT_SRC_XTRANSE, + .ev_src_ye = MMA8452_TRANSIENT_SRC_YTRANSE, + .ev_src_ze = MMA8452_TRANSIENT_SRC_ZTRANSE, + .ev_ths = MMA8452_TRANSIENT_THS, + .ev_ths_mask = MMA8452_TRANSIENT_THS_MASK, + .ev_count = MMA8452_TRANSIENT_COUNT, + }, + [mma8452] = { + .chip_id = MMA8452_DEVICE_ID, + .channels = mma8452_channels, + .num_channels = ARRAY_SIZE(mma8452_channels), .mma_scales = { {0, 9577}, {0, 19154}, {0, 38307} }, .ev_cfg = MMA8452_TRANSIENT_CFG, .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE, @@ -1173,6 +1201,7 @@ static int mma8452_reset(struct i2c_client *client) } static const struct of_device_id mma8452_dt_ids[] = { + { .compatible = "fsl,mma8451", .data = &mma_chip_info_table[mma8451] }, { .compatible = "fsl,mma8452", .data = &mma_chip_info_table[mma8452] }, { .compatible = "fsl,mma8453", .data = &mma_chip_info_table[mma8453] }, { .compatible = "fsl,mma8652", .data = &mma_chip_info_table[mma8652] }, @@ -1209,6 +1238,7 @@ static int mma8452_probe(struct i2c_client *client, return ret; switch (ret) { + case MMA8451_DEVICE_ID: case MMA8452_DEVICE_ID: case MMA8453_DEVICE_ID: case MMA8652_DEVICE_ID: -- 2.1.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] iio: mma8452: add support for MMA8451Q 2016-01-16 14:35 ` [PATCH 3/3] iio: mma8452: add support for MMA8451Q Martin Kepplinger @ 2016-01-23 16:29 ` Jonathan Cameron 0 siblings, 0 replies; 8+ messages in thread From: Jonathan Cameron @ 2016-01-23 16:29 UTC (permalink / raw) To: Martin Kepplinger, knaack.h, lars, pmeerw, christoph.muellner, mfuzzey Cc: linux-iio, linux-kernel, Martin Kepplinger On 16/01/16 14:35, Martin Kepplinger wrote: > This adds support for this series' 14 bit accelerometer chip, MMA8451Q. > It's datasheet is available at the vendor's website: > > https://cache.freescale.com/files/sensors/doc/data_sheet/MMA8451Q.pdf > > Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com> > Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > .../devicetree/bindings/iio/accel/mma8452.txt | 4 ++- > drivers/iio/accel/Kconfig | 2 +- > drivers/iio/accel/mma8452.c | 42 ++++++++++++++++++---- > 3 files changed, 40 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/iio/accel/mma8452.txt b/Documentation/devicetree/bindings/iio/accel/mma8452.txt > index 3c10e85..165937e 100644 > --- a/Documentation/devicetree/bindings/iio/accel/mma8452.txt > +++ b/Documentation/devicetree/bindings/iio/accel/mma8452.txt > @@ -1,8 +1,10 @@ > -Freescale MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC triaxial accelerometer > +Freescale MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC > +triaxial accelerometer > > Required properties: > > - compatible: should contain one of > + * "fsl,mma8451" > * "fsl,mma8452" > * "fsl,mma8453" > * "fsl,mma8652" > diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig > index edc29b1..d9feaa3 100644 > --- a/drivers/iio/accel/Kconfig > +++ b/drivers/iio/accel/Kconfig > @@ -143,7 +143,7 @@ config MMA8452 > select IIO_TRIGGERED_BUFFER > help > Say yes here to build support for the following Freescale 3-axis > - accelerometers: MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC. > + accelerometers: MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC. > > To compile this driver as a module, choose M here: the module > will be called mma8452. > diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c > index 843169e..7f4994f 100644 > --- a/drivers/iio/accel/mma8452.c > +++ b/drivers/iio/accel/mma8452.c > @@ -1,6 +1,7 @@ > /* > * mma8452.c - Support for following Freescale 3-axis accelerometers: > * > + * MMA8451Q (14 bit) > * MMA8452Q (12 bit) > * MMA8453Q (10 bit) > * MMA8652FC (12 bit) > @@ -85,6 +86,7 @@ > #define MMA8452_INT_FF_MT BIT(2) > #define MMA8452_INT_TRANS BIT(5) > > +#define MMA8451_DEVICE_ID 0x1a > #define MMA8452_DEVICE_ID 0x2a > #define MMA8453_DEVICE_ID 0x3a > #define MMA8652_DEVICE_ID 0x4a > @@ -942,6 +944,14 @@ static struct attribute_group mma8452_event_attribute_group = { > .num_event_specs = ARRAY_SIZE(mma8452_motion_event), \ > } > > +static const struct iio_chan_spec mma8451_channels[] = { > + MMA8452_CHANNEL(X, idx_x, 14), > + MMA8452_CHANNEL(Y, idx_y, 14), > + MMA8452_CHANNEL(Z, idx_z, 14), > + IIO_CHAN_SOFT_TIMESTAMP(idx_ts), > + MMA8452_FREEFALL_CHANNEL(IIO_MOD_X_AND_Y_AND_Z), > +}; > + > static const struct iio_chan_spec mma8452_channels[] = { > MMA8452_CHANNEL(X, idx_x, 12), > MMA8452_CHANNEL(Y, idx_y, 12), > @@ -975,6 +985,7 @@ static const struct iio_chan_spec mma8653_channels[] = { > }; > > enum { > + mma8451, > mma8452, > mma8453, > mma8652, > @@ -982,17 +993,34 @@ enum { > }; > > static const struct mma_chip_info mma_chip_info_table[] = { > - [mma8452] = { > - .chip_id = MMA8452_DEVICE_ID, > - .channels = mma8452_channels, > - .num_channels = ARRAY_SIZE(mma8452_channels), > + [mma8451] = { > + .chip_id = MMA8451_DEVICE_ID, > + .channels = mma8451_channels, > + .num_channels = ARRAY_SIZE(mma8451_channels), > /* > * Hardware has fullscale of -2G, -4G, -8G corresponding to > - * raw value -2048 for 12 bit or -512 for 10 bit. > + * raw value -8192 for 14 bit, -2048 for 12 bit or -512 for 10 > + * bit. > * The userspace interface uses m/s^2 and we declare micro units > * So scale factor for 12 bit here is given by: > - * g * N * 1000000 / 2048 for N = 2, 4, 8 and g=9.80665 > + * g * N * 1000000 / 2048 for N = 2, 4, 8 and g=9.80665 > */ > + .mma_scales = { {0, 2394}, {0, 4788}, {0, 9577} }, > + .ev_cfg = MMA8452_TRANSIENT_CFG, > + .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE, > + .ev_cfg_chan_shift = 1, > + .ev_src = MMA8452_TRANSIENT_SRC, > + .ev_src_xe = MMA8452_TRANSIENT_SRC_XTRANSE, > + .ev_src_ye = MMA8452_TRANSIENT_SRC_YTRANSE, > + .ev_src_ze = MMA8452_TRANSIENT_SRC_ZTRANSE, > + .ev_ths = MMA8452_TRANSIENT_THS, > + .ev_ths_mask = MMA8452_TRANSIENT_THS_MASK, > + .ev_count = MMA8452_TRANSIENT_COUNT, > + }, > + [mma8452] = { > + .chip_id = MMA8452_DEVICE_ID, > + .channels = mma8452_channels, > + .num_channels = ARRAY_SIZE(mma8452_channels), > .mma_scales = { {0, 9577}, {0, 19154}, {0, 38307} }, > .ev_cfg = MMA8452_TRANSIENT_CFG, > .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE, > @@ -1173,6 +1201,7 @@ static int mma8452_reset(struct i2c_client *client) > } > > static const struct of_device_id mma8452_dt_ids[] = { > + { .compatible = "fsl,mma8451", .data = &mma_chip_info_table[mma8451] }, > { .compatible = "fsl,mma8452", .data = &mma_chip_info_table[mma8452] }, > { .compatible = "fsl,mma8453", .data = &mma_chip_info_table[mma8453] }, > { .compatible = "fsl,mma8652", .data = &mma_chip_info_table[mma8652] }, > @@ -1209,6 +1238,7 @@ static int mma8452_probe(struct i2c_client *client, > return ret; > > switch (ret) { > + case MMA8451_DEVICE_ID: > case MMA8452_DEVICE_ID: > case MMA8453_DEVICE_ID: > case MMA8652_DEVICE_ID: > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-01-23 16:29 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-16 14:35 iio: mma8452: driver improvements for v4.6 Martin Kepplinger 2016-01-16 14:35 ` [PATCH v6 1/3] iio: mma8452: add freefall detection for Freescale's accelerometers Martin Kepplinger 2016-01-22 17:13 ` Martin Kepplinger 2016-01-23 16:28 ` Jonathan Cameron 2016-01-16 14:35 ` [PATCH 2/3] iio: mma8452: whitespace cleanup Martin Kepplinger 2016-01-23 16:28 ` Jonathan Cameron 2016-01-16 14:35 ` [PATCH 3/3] iio: mma8452: add support for MMA8451Q Martin Kepplinger 2016-01-23 16:29 ` Jonathan Cameron
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).