Commit 09f4eb40 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio:dac Add IIO_CHAN_INFO_RAW entries to all drivers. 



Precursor to making value read / write attribute optional.
No processed versions in DACs.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b11f98ff

drivers/staging/iio/dac/ad5064.c

+4 −3
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int ad5064_read_raw(struct iio_dev *indio_dev, 
	int scale_uv;



	switch (m) {

	case 0:

	case IIO_CHAN_INFO_RAW:

		*val = st->dac_cache[chan->channel];

		return IIO_VAL_INT;

	case IIO_CHAN_INFO_SCALE:
@@ -260,7 +260,7 @@ static int ad5064_write_raw(struct iio_dev *indio_dev, 
	int ret;



	switch (mask) {

	case 0:

	case IIO_CHAN_INFO_RAW:

		if (val > (1 << chan->scan_type.realbits) || val < 0)

			return -EINVAL;
@@ -308,7 +308,8 @@ static struct iio_chan_spec_ext_info ad5064_ext_info[] = { 
	.indexed = 1,						\

	.output = 1,						\

	.channel = (chan),					\

	.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,	\

	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\

	IIO_CHAN_INFO_SCALE_SEPARATE_BIT,			\

	.address = AD5064_ADDR_DAC(chan),			\

	.scan_type = IIO_ST('u', (bits), 16, 20 - (bits)),	\

	.ext_info = ad5064_ext_info,				\

drivers/staging/iio/dac/ad5360.c

+4 −3
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ enum ad5360_type { 
	.type = IIO_VOLTAGE,					\

	.indexed = 1,						\

	.output = 1,						\

	.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT |	\

	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\

		IIO_CHAN_INFO_SCALE_SEPARATE_BIT |		\

		IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |		\

		IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |	\

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,	\
@@ -319,7 +320,7 @@ static int ad5360_write_raw(struct iio_dev *indio_dev, 
	unsigned int ofs_index;



	switch (mask) {

	case 0:

	case IIO_CHAN_INFO_RAW:

		if (val >= max_val || val < 0)

			return -EINVAL;
@@ -376,7 +377,7 @@ static int ad5360_read_raw(struct iio_dev *indio_dev, 
	int ret;



	switch (m) {

	case 0:

	case IIO_CHAN_INFO_RAW:

		ret = ad5360_read(indio_dev, AD5360_READBACK_X1A,

			chan->address);

		if (ret < 0)

drivers/staging/iio/dac/ad5380.c

+4 −3
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ enum ad5380_type { 
	.type = IIO_VOLTAGE,					\

	.indexed = 1,						\

	.output = 1,						\

	.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |		\

	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\

		IIO_CHAN_INFO_SCALE_SHARED_BIT |		\

		IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |		\

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,		\

	.scan_type = IIO_ST('u', (_bits), 16, 14 - (_bits))	\
@@ -292,7 +293,7 @@ static int ad5380_write_raw(struct iio_dev *indio_dev, 
	struct ad5380_state *st = iio_priv(indio_dev);



	switch (info) {

	case 0:

	case IIO_CHAN_INFO_RAW:

	case IIO_CHAN_INFO_CALIBSCALE:

		if (val >= max_val || val < 0)

			return -EINVAL;
@@ -322,7 +323,7 @@ static int ad5380_read_raw(struct iio_dev *indio_dev, 
	int ret;



	switch (info) {

	case 0:

	case IIO_CHAN_INFO_RAW:

	case IIO_CHAN_INFO_CALIBSCALE:

		ret = regmap_read(st->regmap, ad5380_info_to_reg(chan, info),

					val);

drivers/staging/iio/dac/ad5421.c

+4 −3
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ static const struct iio_chan_spec ad5421_channels[] = { 
		.indexed = 1,

		.output = 1,

		.channel = 0,

		.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |

		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |

			IIO_CHAN_INFO_SCALE_SHARED_BIT |

			IIO_CHAN_INFO_OFFSET_SHARED_BIT |

			IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |

			IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
@@ -304,7 +305,7 @@ static int ad5421_read_raw(struct iio_dev *indio_dev, 
		return -EINVAL;



	switch (m) {

	case 0:

	case IIO_CHAN_INFO_RAW:

		ret = ad5421_read(indio_dev, AD5421_REG_DAC_DATA);

		if (ret < 0)

			return ret;
@@ -340,7 +341,7 @@ static int ad5421_write_raw(struct iio_dev *indio_dev, 
	const unsigned int max_val = 1 << 16;



	switch (mask) {

	case 0:

	case IIO_CHAN_INFO_RAW:

		if (val >= max_val || val < 0)

			return -EINVAL;

drivers/staging/iio/dac/ad5446.c

+3 −2
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ static const struct attribute_group ad5446_attribute_group = { 
	.indexed = 1, \

	.output = 1, \

	.channel = 0, \

	.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT, \

	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \

	IIO_CHAN_INFO_SCALE_SHARED_BIT,	\

	.scan_type = IIO_ST('u', (bits), (storage), (shift)) \

}
@@ -274,7 +275,7 @@ static int ad5446_write_raw(struct iio_dev *indio_dev, 
	int ret;



	switch (mask) {

	case 0:

	case IIO_CHAN_INFO_RAW:

		if (val >= (1 << chan->scan_type.realbits) || val < 0)

			return -EINVAL;