Merge tag 'pwm/for-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[cascardo/linux.git] / drivers / iio / accel / mma8452.c
index b921d84..1eccc2d 100644 (file)
@@ -1,6 +1,12 @@
 /*
- * mma8452.c - Support for Freescale MMA8452Q 3-axis 12-bit accelerometer
+ * mma8452.c - Support for following Freescale 3-axis accelerometers:
  *
+ * MMA8452Q (12 bit)
+ * MMA8453Q (10 bit)
+ * MMA8652FC (12 bit)
+ * MMA8653FC (10 bit)
+ *
+ * Copyright 2015 Martin Kepplinger <martin.kepplinger@theobroma-systems.com>
  * Copyright 2014 Peter Meerwald <pmeerw@pmeerw.net>
  *
  * This file is subject to the terms and conditions of version 2 of
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/events.h>
 #include <linux/delay.h>
+#include <linux/of_device.h>
 
 #define MMA8452_STATUS                         0x00
 #define  MMA8452_STATUS_DRDY                   (BIT(2) | BIT(1) | BIT(0))
-#define MMA8452_OUT_X                          0x01 /* MSB first, 12-bit  */
+#define MMA8452_OUT_X                          0x01 /* MSB first */
 #define MMA8452_OUT_Y                          0x03
 #define MMA8452_OUT_Z                          0x05
 #define MMA8452_INT_SRC                                0x0c
 #define  MMA8452_DATA_CFG_HPF_MASK             BIT(4)
 #define MMA8452_HP_FILTER_CUTOFF               0x0f
 #define  MMA8452_HP_FILTER_CUTOFF_SEL_MASK     GENMASK(1, 0)
+#define MMA8452_FF_MT_CFG                      0x15
+#define  MMA8452_FF_MT_CFG_OAE                 BIT(6)
+#define  MMA8452_FF_MT_CFG_ELE                 BIT(7)
+#define MMA8452_FF_MT_SRC                      0x16
+#define  MMA8452_FF_MT_SRC_XHE                 BIT(1)
+#define  MMA8452_FF_MT_SRC_YHE                 BIT(3)
+#define  MMA8452_FF_MT_SRC_ZHE                 BIT(5)
+#define MMA8452_FF_MT_THS                      0x17
+#define  MMA8452_FF_MT_THS_MASK                        0x7f
+#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_MAX_REG                                0x31
 
 #define  MMA8452_INT_DRDY                      BIT(0)
+#define  MMA8452_INT_FF_MT                     BIT(2)
 #define  MMA8452_INT_TRANS                     BIT(5)
 
 #define  MMA8452_DEVICE_ID                     0x2a
+#define  MMA8453_DEVICE_ID                     0x3a
+#define MMA8652_DEVICE_ID                      0x4a
+#define MMA8653_DEVICE_ID                      0x5a
 
 struct mma8452_data {
        struct i2c_client *client;
        struct mutex lock;
        u8 ctrl_reg1;
        u8 data_cfg;
+       const struct mma_chip_info *chip_info;
+};
+
+/**
+ * struct mma_chip_info - chip specific data for Freescale's accelerometers
+ * @chip_id:                   WHO_AM_I register's value
+ * @channels:                  struct iio_chan_spec matching the device's
+ *                             capabilities
+ * @num_channels:              number of channels
+ * @mma_scales:                        scale factors for converting register values
+ *                             to m/s^2; 3 modes: 2g, 4g, 8g; 2 integers
+ *                             per mode: m/s^2 and micro m/s^2
+ * @ev_cfg:                    event config register address
+ * @ev_cfg_ele:                        latch bit in event config register
+ * @ev_cfg_chan_shift:         number of the bit to enable events in X
+ *                             direction; in event config register
+ * @ev_src:                    event source register address
+ * @ev_src_xe:                 bit in event source register that indicates
+ *                             an event in X direction
+ * @ev_src_ye:                 bit in event source register that indicates
+ *                             an event in Y direction
+ * @ev_src_ze:                 bit in event source register that indicates
+ *                             an event in Z direction
+ * @ev_ths:                    event threshold register address
+ * @ev_ths_mask:               mask for the threshold value
+ * @ev_count:                  event count (period) register address
+ *
+ * Since not all chips supported by the driver support comparing high pass
+ * filtered data for events (interrupts), different interrupt sources are
+ * used for different chips and the relevant registers are included here.
+ */
+struct mma_chip_info {
+       u8 chip_id;
+       const struct iio_chan_spec *channels;
+       int num_channels;
+       const int mma_scales[3][2];
+       u8 ev_cfg;
+       u8 ev_cfg_ele;
+       u8 ev_cfg_chan_shift;
+       u8 ev_src;
+       u8 ev_src_xe;
+       u8 ev_src_ye;
+       u8 ev_src_ze;
+       u8 ev_ths;
+       u8 ev_ths_mask;
+       u8 ev_count;
 };
 
 static int mma8452_drdy(struct mma8452_data *data)
@@ -143,16 +210,6 @@ static const int mma8452_samp_freq[8][2] = {
        {6, 250000}, {1, 560000}
 };
 
-/*
- * Hardware has fullscale of -2G, -4G, -8G corresponding to raw value -2048
- * The userspace interface uses m/s^2 and we declare micro units
- * So scale factor is given by:
- *     g * N * 1000000 / 2048 for N = 2, 4, 8 and g = 9.80665
- */
-static const int mma8452_scales[3][2] = {
-       {0, 9577}, {0, 19154}, {0, 38307}
-};
-
 /* Datasheet table 35  (step time vs sample frequency) */
 static const int mma8452_transient_time_step_us[8] = {
        1250,
@@ -189,8 +246,11 @@ static ssize_t mma8452_show_scale_avail(struct device *dev,
                                        struct device_attribute *attr,
                                        char *buf)
 {
-       return mma8452_show_int_plus_micros(buf, mma8452_scales,
-                                           ARRAY_SIZE(mma8452_scales));
+       struct mma8452_data *data = iio_priv(i2c_get_clientdata(
+                                            to_i2c_client(dev)));
+
+       return mma8452_show_int_plus_micros(buf, data->chip_info->mma_scales,
+               ARRAY_SIZE(data->chip_info->mma_scales));
 }
 
 static ssize_t mma8452_show_hp_cutoff_avail(struct device *dev,
@@ -221,9 +281,8 @@ static int mma8452_get_samp_freq_index(struct mma8452_data *data,
 
 static int mma8452_get_scale_index(struct mma8452_data *data, int val, int val2)
 {
-       return mma8452_get_int_plus_micros_index(mma8452_scales,
-                                                ARRAY_SIZE(mma8452_scales),
-                                                val, val2);
+       return mma8452_get_int_plus_micros_index(data->chip_info->mma_scales,
+                       ARRAY_SIZE(data->chip_info->mma_scales), val, val2);
 }
 
 static int mma8452_get_hp_filter_index(struct mma8452_data *data,
@@ -270,14 +329,15 @@ static int mma8452_read_raw(struct iio_dev *indio_dev,
                if (ret < 0)
                        return ret;
 
-               *val = sign_extend32(be16_to_cpu(buffer[chan->scan_index]) >> 4,
-                                    11);
+               *val = sign_extend32(be16_to_cpu(
+                       buffer[chan->scan_index]) >> chan->scan_type.shift,
+                       chan->scan_type.realbits - 1);
 
                return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
                i = data->data_cfg & MMA8452_DATA_CFG_FS_MASK;
-               *val = mma8452_scales[i][0];
-               *val2 = mma8452_scales[i][1];
+               *val = data->chip_info->mma_scales[i][0];
+               *val2 = data->chip_info->mma_scales[i][1];
 
                return IIO_VAL_INT_PLUS_MICRO;
        case IIO_CHAN_INFO_SAMP_FREQ:
@@ -439,17 +499,17 @@ static int mma8452_read_thresh(struct iio_dev *indio_dev,
        switch (info) {
        case IIO_EV_INFO_VALUE:
                ret = i2c_smbus_read_byte_data(data->client,
-                                              MMA8452_TRANSIENT_THS);
+                                              data->chip_info->ev_ths);
                if (ret < 0)
                        return ret;
 
-               *val = ret & MMA8452_TRANSIENT_THS_MASK;
+               *val = ret & data->chip_info->ev_ths_mask;
 
                return IIO_VAL_INT;
 
        case IIO_EV_INFO_PERIOD:
                ret = i2c_smbus_read_byte_data(data->client,
-                                              MMA8452_TRANSIENT_COUNT);
+                                              data->chip_info->ev_count);
                if (ret < 0)
                        return ret;
 
@@ -497,7 +557,8 @@ static int mma8452_write_thresh(struct iio_dev *indio_dev,
                if (val < 0 || val > MMA8452_TRANSIENT_THS_MASK)
                        return -EINVAL;
 
-               return mma8452_change_config(data, MMA8452_TRANSIENT_THS, val);
+               return mma8452_change_config(data, data->chip_info->ev_ths,
+                                            val);
 
        case IIO_EV_INFO_PERIOD:
                steps = (val * USEC_PER_SEC + val2) /
@@ -507,7 +568,7 @@ static int mma8452_write_thresh(struct iio_dev *indio_dev,
                if (steps < 0 || steps > 0xff)
                        return -EINVAL;
 
-               return mma8452_change_config(data, MMA8452_TRANSIENT_COUNT,
+               return mma8452_change_config(data, data->chip_info->ev_count,
                                             steps);
 
        case IIO_EV_INFO_HIGH_PASS_FILTER_3DB:
@@ -538,13 +599,15 @@ static int mma8452_read_event_config(struct iio_dev *indio_dev,
                                     enum iio_event_direction dir)
 {
        struct mma8452_data *data = iio_priv(indio_dev);
+       const struct mma_chip_info *chip = data->chip_info;
        int ret;
 
-       ret = i2c_smbus_read_byte_data(data->client, MMA8452_TRANSIENT_CFG);
+       ret = i2c_smbus_read_byte_data(data->client,
+                                      data->chip_info->ev_cfg);
        if (ret < 0)
                return ret;
 
-       return ret & MMA8452_TRANSIENT_CFG_CHAN(chan->scan_index) ? 1 : 0;
+       return !!(ret & BIT(chan->scan_index + chip->ev_cfg_chan_shift));
 }
 
 static int mma8452_write_event_config(struct iio_dev *indio_dev,
@@ -554,20 +617,22 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev,
                                      int state)
 {
        struct mma8452_data *data = iio_priv(indio_dev);
+       const struct mma_chip_info *chip = data->chip_info;
        int val;
 
-       val = i2c_smbus_read_byte_data(data->client, MMA8452_TRANSIENT_CFG);
+       val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg);
        if (val < 0)
                return val;
 
        if (state)
-               val |= MMA8452_TRANSIENT_CFG_CHAN(chan->scan_index);
+               val |= BIT(chan->scan_index + chip->ev_cfg_chan_shift);
        else
-               val &= ~MMA8452_TRANSIENT_CFG_CHAN(chan->scan_index);
+               val &= ~BIT(chan->scan_index + chip->ev_cfg_chan_shift);
 
-       val |= MMA8452_TRANSIENT_CFG_ELE;
+       val |= chip->ev_cfg_ele;
+       val |= MMA8452_FF_MT_CFG_OAE;
 
-       return mma8452_change_config(data, MMA8452_TRANSIENT_CFG, val);
+       return mma8452_change_config(data, chip->ev_cfg, val);
 }
 
 static void mma8452_transient_interrupt(struct iio_dev *indio_dev)
@@ -576,25 +641,25 @@ static void mma8452_transient_interrupt(struct iio_dev *indio_dev)
        s64 ts = iio_get_time_ns();
        int src;
 
-       src = i2c_smbus_read_byte_data(data->client, MMA8452_TRANSIENT_SRC);
+       src = i2c_smbus_read_byte_data(data->client, data->chip_info->ev_src);
        if (src < 0)
                return;
 
-       if (src & MMA8452_TRANSIENT_SRC_XTRANSE)
+       if (src & data->chip_info->ev_src_xe)
                iio_push_event(indio_dev,
                               IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_X,
                                                  IIO_EV_TYPE_MAG,
                                                  IIO_EV_DIR_RISING),
                               ts);
 
-       if (src & MMA8452_TRANSIENT_SRC_YTRANSE)
+       if (src & data->chip_info->ev_src_ye)
                iio_push_event(indio_dev,
                               IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_Y,
                                                  IIO_EV_TYPE_MAG,
                                                  IIO_EV_DIR_RISING),
                               ts);
 
-       if (src & MMA8452_TRANSIENT_SRC_ZTRANSE)
+       if (src & data->chip_info->ev_src_ze)
                iio_push_event(indio_dev,
                               IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_Z,
                                                  IIO_EV_TYPE_MAG,
@@ -606,6 +671,7 @@ static irqreturn_t mma8452_interrupt(int irq, void *p)
 {
        struct iio_dev *indio_dev = p;
        struct mma8452_data *data = iio_priv(indio_dev);
+       const struct mma_chip_info *chip = data->chip_info;
        int ret = IRQ_NONE;
        int src;
 
@@ -618,7 +684,10 @@ static irqreturn_t mma8452_interrupt(int irq, void *p)
                ret = IRQ_HANDLED;
        }
 
-       if (src & MMA8452_INT_TRANS) {
+       if ((src & MMA8452_INT_TRANS &&
+            chip->ev_src == MMA8452_TRANSIENT_SRC) ||
+           (src & MMA8452_INT_FF_MT &&
+            chip->ev_src == MMA8452_FF_MT_SRC)) {
                mma8452_transient_interrupt(indio_dev);
                ret = IRQ_HANDLED;
        }
@@ -680,6 +749,16 @@ static const struct iio_event_spec mma8452_transient_event[] = {
        },
 };
 
+static const struct iio_event_spec mma8452_motion_event[] = {
+       {
+               .type = IIO_EV_TYPE_MAG,
+               .dir = IIO_EV_DIR_RISING,
+               .mask_separate = BIT(IIO_EV_INFO_ENABLE),
+               .mask_shared_by_type = BIT(IIO_EV_INFO_VALUE) |
+                                       BIT(IIO_EV_INFO_PERIOD)
+       },
+};
+
 /*
  * Threshold is configured in fixed 8G/127 steps regardless of
  * currently selected scale for measurement.
@@ -693,10 +772,9 @@ static struct attribute *mma8452_event_attributes[] = {
 
 static struct attribute_group mma8452_event_attribute_group = {
        .attrs = mma8452_event_attributes,
-       .name = "events",
 };
 
-#define MMA8452_CHANNEL(axis, idx) { \
+#define MMA8452_CHANNEL(axis, idx, bits) { \
        .type = IIO_ACCEL, \
        .modified = 1, \
        .channel2 = IIO_MOD_##axis, \
@@ -708,22 +786,144 @@ static struct attribute_group mma8452_event_attribute_group = {
        .scan_index = idx, \
        .scan_type = { \
                .sign = 's', \
-               .realbits = 12, \
+               .realbits = (bits), \
                .storagebits = 16, \
-               .shift = 4, \
+               .shift = 16 - (bits), \
                .endianness = IIO_BE, \
        }, \
        .event_spec = mma8452_transient_event, \
        .num_event_specs = ARRAY_SIZE(mma8452_transient_event), \
 }
 
+#define MMA8652_CHANNEL(axis, idx, bits) { \
+       .type = IIO_ACCEL, \
+       .modified = 1, \
+       .channel2 = IIO_MOD_##axis, \
+       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
+               BIT(IIO_CHAN_INFO_CALIBBIAS), \
+       .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SAMP_FREQ) | \
+               BIT(IIO_CHAN_INFO_SCALE), \
+       .scan_index = idx, \
+       .scan_type = { \
+               .sign = 's', \
+               .realbits = (bits), \
+               .storagebits = 16, \
+               .shift = 16 - (bits), \
+               .endianness = IIO_BE, \
+       }, \
+       .event_spec = mma8452_motion_event, \
+       .num_event_specs = ARRAY_SIZE(mma8452_motion_event), \
+}
+
 static const struct iio_chan_spec mma8452_channels[] = {
-       MMA8452_CHANNEL(X, 0),
-       MMA8452_CHANNEL(Y, 1),
-       MMA8452_CHANNEL(Z, 2),
+       MMA8452_CHANNEL(X, 0, 12),
+       MMA8452_CHANNEL(Y, 1, 12),
+       MMA8452_CHANNEL(Z, 2, 12),
        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),
+};
+
+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),
+};
+
+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),
+};
+
+enum {
+       mma8452,
+       mma8453,
+       mma8652,
+       mma8653,
+};
+
+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),
+               /*
+                * Hardware has fullscale of -2G, -4G, -8G corresponding to
+                * raw value -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
+                */
+               .mma_scales = { {0, 9577}, {0, 19154}, {0, 38307} },
+               .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,
+       },
+       [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,
+       },
+       [mma8652] = {
+               .chip_id = MMA8652_DEVICE_ID,
+               .channels = mma8652_channels,
+               .num_channels = ARRAY_SIZE(mma8652_channels),
+               .mma_scales = { {0, 9577}, {0, 19154}, {0, 38307} },
+               .ev_cfg = MMA8452_FF_MT_CFG,
+               .ev_cfg_ele = MMA8452_FF_MT_CFG_ELE,
+               .ev_cfg_chan_shift = 3,
+               .ev_src = MMA8452_FF_MT_SRC,
+               .ev_src_xe = MMA8452_FF_MT_SRC_XHE,
+               .ev_src_ye = MMA8452_FF_MT_SRC_YHE,
+               .ev_src_ze = MMA8452_FF_MT_SRC_ZHE,
+               .ev_ths = MMA8452_FF_MT_THS,
+               .ev_ths_mask = MMA8452_FF_MT_THS_MASK,
+               .ev_count = MMA8452_FF_MT_COUNT,
+       },
+       [mma8653] = {
+               .chip_id = MMA8653_DEVICE_ID,
+               .channels = mma8653_channels,
+               .num_channels = ARRAY_SIZE(mma8653_channels),
+               .mma_scales = { {0, 38307}, {0, 76614}, {0, 153228} },
+               .ev_cfg = MMA8452_FF_MT_CFG,
+               .ev_cfg_ele = MMA8452_FF_MT_CFG_ELE,
+               .ev_cfg_chan_shift = 3,
+               .ev_src = MMA8452_FF_MT_SRC,
+               .ev_src_xe = MMA8452_FF_MT_SRC_XHE,
+               .ev_src_ye = MMA8452_FF_MT_SRC_YHE,
+               .ev_src_ze = MMA8452_FF_MT_SRC_ZHE,
+               .ev_ths = MMA8452_FF_MT_THS,
+               .ev_ths_mask = MMA8452_FF_MT_THS_MASK,
+               .ev_count = MMA8452_FF_MT_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,
@@ -841,18 +1041,28 @@ static int mma8452_reset(struct i2c_client *client)
        return -ETIMEDOUT;
 }
 
+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] },
+       { .compatible = "fsl,mma8652", .data = &mma_chip_info_table[mma8652] },
+       { .compatible = "fsl,mma8653", .data = &mma_chip_info_table[mma8653] },
+       { }
+};
+MODULE_DEVICE_TABLE(of, mma8452_dt_ids);
+
 static int mma8452_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
        struct mma8452_data *data;
        struct iio_dev *indio_dev;
        int ret;
+       const struct of_device_id *match;
 
-       ret = i2c_smbus_read_byte_data(client, MMA8452_WHO_AM_I);
-       if (ret < 0)
-               return ret;
-       if (ret != MMA8452_DEVICE_ID)
+       match = of_match_device(mma8452_dt_ids, &client->dev);
+       if (!match) {
+               dev_err(&client->dev, "unknown device model\n");
                return -ENODEV;
+       }
 
        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
        if (!indio_dev)
@@ -861,14 +1071,33 @@ static int mma8452_probe(struct i2c_client *client,
        data = iio_priv(indio_dev);
        data->client = client;
        mutex_init(&data->lock);
+       data->chip_info = match->data;
+
+       ret = i2c_smbus_read_byte_data(client, MMA8452_WHO_AM_I);
+       if (ret < 0)
+               return ret;
+
+       switch (ret) {
+       case MMA8452_DEVICE_ID:
+       case MMA8453_DEVICE_ID:
+       case MMA8652_DEVICE_ID:
+       case MMA8653_DEVICE_ID:
+               if (ret == data->chip_info->chip_id)
+                       break;
+       default:
+               return -ENODEV;
+       }
+
+       dev_info(&client->dev, "registering %s accelerometer; ID 0x%x\n",
+                match->compatible, data->chip_info->chip_id);
 
        i2c_set_clientdata(client, indio_dev);
        indio_dev->info = &mma8452_info;
        indio_dev->name = id->name;
        indio_dev->dev.parent = &client->dev;
        indio_dev->modes = INDIO_DIRECT_MODE;
-       indio_dev->channels = mma8452_channels;
-       indio_dev->num_channels = ARRAY_SIZE(mma8452_channels);
+       indio_dev->channels = data->chip_info->channels;
+       indio_dev->num_channels = data->chip_info->num_channels;
        indio_dev->available_scan_masks = mma8452_scan_masks;
 
        ret = mma8452_reset(client);
@@ -892,13 +1121,15 @@ static int mma8452_probe(struct i2c_client *client,
 
        if (client->irq) {
                /*
-                * Although we enable the transient interrupt source once and
-                * for all here the transient event detection itself is not
-                * enabled until userspace asks for it by
-                * mma8452_write_event_config()
+                * Although we enable the interrupt sources once and for
+                * all here the event detection itself is not enabled until
+                * userspace asks for it by mma8452_write_event_config()
                 */
-               int supported_interrupts = MMA8452_INT_DRDY | MMA8452_INT_TRANS;
-               int enabled_interrupts = MMA8452_INT_TRANS;
+               int supported_interrupts = MMA8452_INT_DRDY |
+                                          MMA8452_INT_TRANS |
+                                          MMA8452_INT_FF_MT;
+               int enabled_interrupts = MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT;
 
                /* Assume wired to INT1 pin */
                ret = i2c_smbus_write_byte_data(client,
@@ -987,17 +1218,14 @@ static SIMPLE_DEV_PM_OPS(mma8452_pm_ops, mma8452_suspend, mma8452_resume);
 #endif
 
 static const struct i2c_device_id mma8452_id[] = {
-       { "mma8452", 0 },
+       { "mma8452", mma8452 },
+       { "mma8453", mma8453 },
+       { "mma8652", mma8652 },
+       { "mma8653", mma8653 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, mma8452_id);
 
-static const struct of_device_id mma8452_dt_ids[] = {
-       { .compatible = "fsl,mma8452" },
-       { }
-};
-MODULE_DEVICE_TABLE(of, mma8452_dt_ids);
-
 static struct i2c_driver mma8452_driver = {
        .driver = {
                .name   = "mma8452",