iio:accel:mma8452: check values to be written

[platform/kernel/linux-starfive.git] / drivers / iio / accel / mma8452.c

diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 51ae751..42640b1 100644 (file)
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -16,8 +16,9 @@
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
-#include <linux/iio/trigger_consumer.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/trigger.h>
+#include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/events.h>
 #include <linux/delay.h>
@@ -66,6 +67,7 @@
 #define MMA8452_DATA_CFG_FS_8G 2
 #define MMA8452_DATA_CFG_HPF_MASK BIT(4)
 
+#define MMA8452_INT_DRDY       BIT(0)
 #define MMA8452_INT_TRANS      BIT(5)
 
 #define MMA8452_DEVICE_ID 0x2a
@@ -226,7 +228,7 @@ static int mma8452_get_hp_filter_index(struct mma8452_data *data,
        int i = mma8452_get_odr_index(data);
 
        return mma8452_get_int_plus_micros_index(mma8452_hp_filter_cutoff[i],
-               ARRAY_SIZE(mma8452_scales[0]), val, val2);
+               ARRAY_SIZE(mma8452_hp_filter_cutoff[0]), val, val2);
 }
 
 static int mma8452_read_hp_filter(struct mma8452_data *data, int *hz, int *uHz)
@@ -341,7 +343,7 @@ static int mma8452_set_hp_filter_frequency(struct mma8452_data *data,
 
        i = mma8452_get_hp_filter_index(data, val, val2);
        if (i < 0)
-               return -EINVAL;
+               return i;
 
        reg = i2c_smbus_read_byte_data(data->client,
                                       MMA8452_HP_FILTER_CUTOFF);
@@ -367,7 +369,7 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
        case IIO_CHAN_INFO_SAMP_FREQ:
                i = mma8452_get_samp_freq_index(data, val, val2);
                if (i < 0)
-                       return -EINVAL;
+                       return i;
 
                data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
                data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
@@ -376,7 +378,7 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
        case IIO_CHAN_INFO_SCALE:
                i = mma8452_get_scale_index(data, val, val2);
                if (i < 0)
-                       return -EINVAL;
+                       return i;
                data->data_cfg &= ~MMA8452_DATA_CFG_FS_MASK;
                data->data_cfg |= i;
                return mma8452_change_config(data, MMA8452_DATA_CFG,
@@ -469,15 +471,17 @@ static int mma8452_write_thresh(struct iio_dev *indio_dev,
 
        switch (info) {
        case IIO_EV_INFO_VALUE:
-               return mma8452_change_config(data, MMA8452_TRANSIENT_THS,
-                                            val & MMA8452_TRANSIENT_THS_MASK);
+               if (val < 0 || val > MMA8452_TRANSIENT_THS_MASK)
+                       return -EINVAL;
+
+               return mma8452_change_config(data, MMA8452_TRANSIENT_THS, val);
 
        case IIO_EV_INFO_PERIOD:
                steps = (val * USEC_PER_SEC + val2) /
                                mma8452_transient_time_step_us[
                                        mma8452_get_odr_index(data)];
 
-               if (steps > 0xff)
+               if (steps < 0 || steps > 0xff)
                        return -EINVAL;
 
                return mma8452_change_config(data, MMA8452_TRANSIENT_COUNT,
@@ -577,18 +581,24 @@ static irqreturn_t mma8452_interrupt(int irq, void *p)
 {
        struct iio_dev *indio_dev = p;
        struct mma8452_data *data = iio_priv(indio_dev);
+       int ret = IRQ_NONE;
        int src;
 
        src = i2c_smbus_read_byte_data(data->client, MMA8452_INT_SRC);
        if (src < 0)
                return IRQ_NONE;
 
+       if (src & MMA8452_INT_DRDY) {
+               iio_trigger_poll_chained(indio_dev->trig);
+               ret = IRQ_HANDLED;
+       }
+
        if (src & MMA8452_INT_TRANS) {
                mma8452_transient_interrupt(indio_dev);
-               return IRQ_HANDLED;
+               ret = IRQ_HANDLED;
        }
 
-       return IRQ_NONE;
+       return ret;
 }
 
 static irqreturn_t mma8452_trigger_handler(int irq, void *p)
@@ -714,6 +724,72 @@ static const struct iio_info mma8452_info = {
 
 static const unsigned long mma8452_scan_masks[] = {0x7, 0};
 
+static int mma8452_data_rdy_trigger_set_state(struct iio_trigger *trig,
+                                             bool state)
+{
+       struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+       struct mma8452_data *data = iio_priv(indio_dev);
+       int reg;
+
+       reg = i2c_smbus_read_byte_data(data->client, MMA8452_CTRL_REG4);
+       if (reg < 0)
+               return reg;
+
+       if (state)
+               reg |= MMA8452_INT_DRDY;
+       else
+               reg &= ~MMA8452_INT_DRDY;
+
+       return mma8452_change_config(data, MMA8452_CTRL_REG4, reg);
+}
+
+static int mma8452_validate_device(struct iio_trigger *trig,
+                                  struct iio_dev *indio_dev)
+{
+       struct iio_dev *indio = iio_trigger_get_drvdata(trig);
+
+       if (indio != indio_dev)
+               return -EINVAL;
+
+       return 0;
+}
+
+static const struct iio_trigger_ops mma8452_trigger_ops = {
+       .set_trigger_state = mma8452_data_rdy_trigger_set_state,
+       .validate_device = mma8452_validate_device,
+       .owner = THIS_MODULE,
+};
+
+static int mma8452_trigger_setup(struct iio_dev *indio_dev)
+{
+       struct mma8452_data *data = iio_priv(indio_dev);
+       struct iio_trigger *trig;
+       int ret;
+
+       trig = devm_iio_trigger_alloc(&data->client->dev, "%s-dev%d",
+                                     indio_dev->name,
+                                     indio_dev->id);
+       if (!trig)
+               return -ENOMEM;
+
+       trig->dev.parent = &data->client->dev;
+       trig->ops = &mma8452_trigger_ops;
+       iio_trigger_set_drvdata(trig, indio_dev);
+
+       ret = iio_trigger_register(trig);
+       if (ret)
+               return ret;
+
+       indio_dev->trig = trig;
+       return 0;
+}
+
+static void mma8452_trigger_cleanup(struct iio_dev *indio_dev)
+{
+       if (indio_dev->trig)
+               iio_trigger_unregister(indio_dev->trig);
+}
+
 static int mma8452_reset(struct i2c_client *client)
 {
        int i;
@@ -794,7 +870,8 @@ static int mma8452_probe(struct i2c_client *client,
                 * enabled until userspace asks for it by
                 * mma8452_write_event_config()
                 */
-               int supported_interrupts = MMA8452_INT_TRANS;
+               int supported_interrupts = MMA8452_INT_DRDY | MMA8452_INT_TRANS;
+               int enabled_interrupts = MMA8452_INT_TRANS;
 
                /* Assume wired to INT1 pin */
                ret = i2c_smbus_write_byte_data(client,
@@ -805,7 +882,11 @@ static int mma8452_probe(struct i2c_client *client,
 
                ret = i2c_smbus_write_byte_data(client,
                                                MMA8452_CTRL_REG4,
-                                               supported_interrupts);
+                                               enabled_interrupts);
+               if (ret < 0)
+                       return ret;
+
+               ret = mma8452_trigger_setup(indio_dev);
                if (ret < 0)
                        return ret;
        }
@@ -815,12 +896,12 @@ static int mma8452_probe(struct i2c_client *client,
        ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,
                                        data->ctrl_reg1);
        if (ret < 0)
-               return ret;
+               goto trigger_cleanup;
 
        ret = iio_triggered_buffer_setup(indio_dev, NULL,
                mma8452_trigger_handler, NULL);
        if (ret < 0)
-               return ret;
+               goto trigger_cleanup;
 
        if (client->irq) {
                ret = devm_request_threaded_irq(&client->dev,
@@ -840,6 +921,10 @@ static int mma8452_probe(struct i2c_client *client,
 
 buffer_cleanup:
        iio_triggered_buffer_cleanup(indio_dev);
+
+trigger_cleanup:
+       mma8452_trigger_cleanup(indio_dev);
+
        return ret;
 }
 
@@ -849,6 +934,7 @@ static int mma8452_remove(struct i2c_client *client)
 
        iio_device_unregister(indio_dev);
        iio_triggered_buffer_cleanup(indio_dev);
+       mma8452_trigger_cleanup(indio_dev);
        mma8452_standby(iio_priv(indio_dev));
 
        return 0;
@@ -883,6 +969,7 @@ 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 = {