forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iio:ad5421: Switch to new event config interface

Browse source 
Switch the ad5421 driver to the new IIO event config interface as the old one
is going to be removed.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2013-10-07 15:11:00 +01:00 • committed by Jonathan Cameron
parent e4ec84f83d
commit 1eefd62b63
1 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

62
drivers/iio/dac/ad5421.c
View file

@ -80,6 +80,29 @@ struct ad5421_state {
} data[2] ____cacheline_aligned; } data[2] ____cacheline_aligned;
}; };
static const struct iio_event_spec ad5421_current_event[] = {
{
.type = IIO_EV_TYPE_THRESH,
.dir = IIO_EV_DIR_RISING,
.mask_separate = BIT(IIO_EV_INFO_VALUE) |
BIT(IIO_EV_INFO_ENABLE),
}, {
.type = IIO_EV_TYPE_THRESH,
.dir = IIO_EV_DIR_FALLING,
.mask_separate = BIT(IIO_EV_INFO_VALUE) |
BIT(IIO_EV_INFO_ENABLE),
},
};
static const struct iio_event_spec ad5421_temp_event[] = {
{
.type = IIO_EV_TYPE_THRESH,
.dir = IIO_EV_DIR_RISING,
.mask_separate = BIT(IIO_EV_INFO_VALUE) |
BIT(IIO_EV_INFO_ENABLE),
},
};
static const struct iio_chan_spec ad5421_channels[] = { static const struct iio_chan_spec ad5421_channels[] = {
{ {
.type = IIO_CURRENT, .type = IIO_CURRENT,
@ -92,13 +115,14 @@ static const struct iio_chan_spec ad5421_channels[] = {
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
BIT(IIO_CHAN_INFO_OFFSET), BIT(IIO_CHAN_INFO_OFFSET),
.scan_type = IIO_ST('u', 16, 16, 0), .scan_type = IIO_ST('u', 16, 16, 0),
.event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) | .event_spec = ad5421_current_event,
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), .num_event_specs = ARRAY_SIZE(ad5421_current_event),
}, },
{ {
.type = IIO_TEMP, .type = IIO_TEMP,
.channel = -1, .channel = -1,
.event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING), .event_spec = ad5421_temp_event,
.num_event_specs = ARRAY_SIZE(ad5421_temp_event),
}, },
}; };
@ -353,15 +377,15 @@ static int ad5421_write_raw(struct iio_dev *indio_dev,
} }
static int ad5421_write_event_config(struct iio_dev *indio_dev, static int ad5421_write_event_config(struct iio_dev *indio_dev,
u64 event_code, int state) const struct iio_chan_spec *chan, enum iio_event_type type,
enum iio_event_direction dir, int state)
{ {
struct ad5421_state *st = iio_priv(indio_dev); struct ad5421_state *st = iio_priv(indio_dev);
unsigned int mask; unsigned int mask;
switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) { switch (chan->type) {
case IIO_CURRENT: case IIO_CURRENT:
if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == if (dir == IIO_EV_DIR_RISING)
IIO_EV_DIR_RISING)
mask = AD5421_FAULT_OVER_CURRENT; mask = AD5421_FAULT_OVER_CURRENT;
else else
mask = AD5421_FAULT_UNDER_CURRENT; mask = AD5421_FAULT_UNDER_CURRENT;
@ -384,15 +408,15 @@ static int ad5421_write_event_config(struct iio_dev *indio_dev,
} }
static int ad5421_read_event_config(struct iio_dev *indio_dev, static int ad5421_read_event_config(struct iio_dev *indio_dev,
u64 event_code) const struct iio_chan_spec *chan, enum iio_event_type type,
enum iio_event_direction dir)
{ {
struct ad5421_state *st = iio_priv(indio_dev); struct ad5421_state *st = iio_priv(indio_dev);
unsigned int mask; unsigned int mask;
switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) { switch (chan->type) {
case IIO_CURRENT: case IIO_CURRENT:
if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == if (dir == IIO_EV_DIR_RISING)
IIO_EV_DIR_RISING)
mask = AD5421_FAULT_OVER_CURRENT; mask = AD5421_FAULT_OVER_CURRENT;
else else
mask = AD5421_FAULT_UNDER_CURRENT; mask = AD5421_FAULT_UNDER_CURRENT;
@ -407,12 +431,14 @@ static int ad5421_read_event_config(struct iio_dev *indio_dev,
return (bool)(st->fault_mask & mask); return (bool)(st->fault_mask & mask);
} }
static int ad5421_read_event_value(struct iio_dev *indio_dev, u64 event_code, static int ad5421_read_event_value(struct iio_dev *indio_dev,
int *val) const struct iio_chan_spec *chan, enum iio_event_type type,
enum iio_event_direction dir, enum iio_event_info info, int *val,
int *val2)
{ {
int ret; int ret;
switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) { switch (chan->type) {
case IIO_CURRENT: case IIO_CURRENT:
ret = ad5421_read(indio_dev, AD5421_REG_DAC_DATA); ret = ad5421_read(indio_dev, AD5421_REG_DAC_DATA);
if (ret < 0) if (ret < 0)
@ -426,15 +452,15 @@ static int ad5421_read_event_value(struct iio_dev *indio_dev, u64 event_code,
return -EINVAL; return -EINVAL;
} }
return 0; return IIO_VAL_INT;
} }
static const struct iio_info ad5421_info = { static const struct iio_info ad5421_info = {
.read_raw = ad5421_read_raw, .read_raw = ad5421_read_raw,
.write_raw = ad5421_write_raw, .write_raw = ad5421_write_raw,
.read_event_config = ad5421_read_event_config, .read_event_config_new = ad5421_read_event_config,
.write_event_config = ad5421_write_event_config, .write_event_config_new = ad5421_write_event_config,
.read_event_value = ad5421_read_event_value, .read_event_value_new = ad5421_read_event_value,
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
}; };