diff options
| author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-12-06 05:54:00 +0000 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2014-07-13 21:57:35 +0100 |
| commit | 0f7ddcc1bff1983d0be1573f971995371669fa4f (patch) | |
| tree | c1702ce3ef24db0117f8360c0e604f8d0b3c22d2 /drivers | |
| parent | 89ca79afe50e9e9608ad3315bf099fdbb82c4eb5 (diff) | |
| download | blackbird-obmc-linux-0f7ddcc1bff1983d0be1573f971995371669fa4f.tar.gz blackbird-obmc-linux-0f7ddcc1bff1983d0be1573f971995371669fa4f.zip | |
iio:adc:ad799x: Write default config on probe and reset alert status on probe
writing ALERT_EN and BUSY_ALERT to the chip config register clears
pending alerts, BUSY_ALERT is cleared when reading back the register
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iio/adc/ad799x.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c index fe2a9b1170b0..84ce9b426a48 100644 --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c @@ -595,7 +595,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { AD799X_CHANNEL_WITH_EVENTS(1, 12), IIO_CHAN_SOFT_TIMESTAMP(3), }, - .default_config = AD7998_ALERT_EN, + .default_config = AD7998_ALERT_EN | AD7998_BUSY_ALERT, .info = &ad7993_4_7_8_irq_info, }, }, @@ -619,7 +619,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { AD799X_CHANNEL_WITH_EVENTS(3, 10), IIO_CHAN_SOFT_TIMESTAMP(4), }, - .default_config = AD7998_ALERT_EN, + .default_config = AD7998_ALERT_EN | AD7998_BUSY_ALERT, .info = &ad7993_4_7_8_irq_info, }, }, @@ -643,7 +643,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { AD799X_CHANNEL_WITH_EVENTS(3, 12), IIO_CHAN_SOFT_TIMESTAMP(4), }, - .default_config = AD7998_ALERT_EN, + .default_config = AD7998_ALERT_EN | AD7998_BUSY_ALERT, .info = &ad7993_4_7_8_irq_info, }, }, @@ -675,7 +675,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { AD799X_CHANNEL(7, 10), IIO_CHAN_SOFT_TIMESTAMP(8), }, - .default_config = AD7998_ALERT_EN, + .default_config = AD7998_ALERT_EN | AD7998_BUSY_ALERT, .info = &ad7993_4_7_8_irq_info, }, }, @@ -707,7 +707,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { AD799X_CHANNEL(7, 12), IIO_CHAN_SOFT_TIMESTAMP(8), }, - .default_config = AD7998_ALERT_EN, + .default_config = AD7998_ALERT_EN | AD7998_BUSY_ALERT, .info = &ad7993_4_7_8_irq_info, }, }, @@ -735,7 +735,6 @@ static int ad799x_probe(struct i2c_client *client, st->chip_config = &chip_info->irq_config; else st->chip_config = &chip_info->noirq_config; - st->config = st->chip_config->default_config; /* TODO: Add pdata options for filtering and bit delay */ @@ -764,6 +763,14 @@ static int ad799x_probe(struct i2c_client *client, indio_dev->channels = st->chip_config->channel; indio_dev->num_channels = chip_info->num_channels; + ret = ad799x_write_config(st, st->chip_config->default_config); + if (ret < 0) + goto error_disable_reg; + ret = ad799x_read_config(st); + if (ret < 0) + goto error_disable_reg; + st->config = ret; + ret = iio_triggered_buffer_setup(indio_dev, NULL, &ad799x_trigger_handler, NULL); if (ret) |
