On 06/07/15 13:34, Martin Kepplinger wrote: > This adds support for the 10 bit version if Freescale's accelerometers > of this series. The datasheet is available at Freescale's website: > > http://cache.freescale.com/files/sensors/doc/data_sheet/MMA8453Q.pdf > > Signed-off-by: Martin Kepplinger <martin.kepplinger@xxxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Christoph Muellner <christoph.muellner@xxxxxxxxxxxxxxxxxxxxx> Again, looks good to me, but I'd like Peter / Martin's Acks ideally. Jonathan > --- > drivers/iio/accel/Kconfig | 6 +++--- > drivers/iio/accel/mma8452.c | 38 +++++++++++++++++++++++++++++++++++--- > 2 files changed, 38 insertions(+), 6 deletions(-) > > diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig > index 00e7bcb..dc80dc9 100644 > --- a/drivers/iio/accel/Kconfig > +++ b/drivers/iio/accel/Kconfig > @@ -87,13 +87,13 @@ config KXSD9 > will be called kxsd9. > > config MMA8452 > - tristate "Freescale MMA8452Q Accelerometer Driver" > + tristate "Freescale MMA8452Q and similar Accelerometers Driver" > depends on I2C > select IIO_BUFFER > select IIO_TRIGGERED_BUFFER > help > - Say yes here to build support for the Freescale MMA8452Q 3-axis > - accelerometer. > + Say yes here to build support for the following Freescale 3-axis > + accelerometers: MMA8452Q, MMA8453Q. > > 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 8919bfb..71b40f7 100644 > --- a/drivers/iio/accel/mma8452.c > +++ b/drivers/iio/accel/mma8452.c > @@ -1,5 +1,8 @@ > /* > - * mma8452.c - Support for Freescale MMA8452Q 3-axis 12-bit accelerometer > + * mma8452.c - Support for following Freescale 3-axis accelerometers: > + * > + * MMA8452Q > + * MMA8453Q > * > * Copyright 2014 Peter Meerwald <pmeerw@xxxxxxxxxx> > * > @@ -27,7 +30,7 @@ > > #define DRIVER_NAME "mma8452" > #define MMA8452_STATUS 0x00 > -#define MMA8452_OUT_X 0x01 /* MSB first, 12-bit */ > +#define MMA8452_OUT_X 0x01 /* MSB first, 10 or 12-bit */ > #define MMA8452_OUT_Y 0x03 > #define MMA8452_OUT_Z 0x05 > #define MMA8452_INT_SRC 0x0c > @@ -74,6 +77,7 @@ > #define MMA8452_INT_TRANS BIT(5) > > #define MMA8452_DEVICE_ID 0x2a > +#define MMA8453_DEVICE_ID 0x3a > > struct mma8452_data { > struct i2c_client *client; > @@ -745,8 +749,16 @@ static const struct iio_chan_spec mma8452_channels[] = { > IIO_CHAN_SOFT_TIMESTAMP(3), > }; > > +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), > +}; > + > enum { > mma8452, > + mma8453, > }; > > static const struct mma_chip_info mma_chip_info_table[] = { > @@ -773,7 +785,24 @@ static const struct mma_chip_info mma_chip_info_table[] = { > .ev_ths_mask = MMA8452_TRANSIENT_THS_MASK, > .ev_count = MMA8452_TRANSIENT_COUNT, > }, > + [mma8453] = { > + .chip_id = MMA8453_DEVICE_ID, > + .channels = mma8453_channels, > + .num_channels = ARRAY_SIZE(mma8453_channels), > + .mma_scales = { {0, 38307}, {0, 76614}, {0, 153228} }, > + .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, > + }, > }; > + > static struct attribute *mma8452_attributes[] = { > &iio_dev_attr_sampling_frequency_available.dev_attr.attr, > &iio_dev_attr_in_accel_scale_available.dev_attr.attr, > @@ -892,6 +921,7 @@ static int mma8452_reset(struct i2c_client *client) > > static const struct of_device_id mma8452_dt_ids[] = { > { .compatible = "fsl,mma8452", .data = &mma_chip_info_table[mma8452] }, > + { .compatible = "fsl,mma8453", .data = &mma_chip_info_table[mma8453] }, > { } > }; > > @@ -906,7 +936,8 @@ static int mma8452_probe(struct i2c_client *client, > ret = i2c_smbus_read_byte_data(client, MMA8452_WHO_AM_I); > if (ret < 0) > return ret; > - if (ret != MMA8452_DEVICE_ID) > + > + if (ret != MMA8452_DEVICE_ID && ret != MMA8453_DEVICE_ID) Perhaps switch this over to a switch statement to prepare for yet more devices being supported in future? > return -ENODEV; > > match = of_match_device(mma8452_dt_ids, &client->dev); > @@ -1053,6 +1084,7 @@ static SIMPLE_DEV_PM_OPS(mma8452_pm_ops, mma8452_suspend, mma8452_resume); > > static const struct i2c_device_id mma8452_id[] = { > { "mma8452", mma8452 }, > + { "mma8453", mma8453 }, > { } > }; > MODULE_DEVICE_TABLE(i2c, mma8452_id); > -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
