From 4a4c88a537980dfd19e6d21b3b7b8c234acb5b1b Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sun, 15 Apr 2012 17:41:27 +0100
Subject: [PATCH] --- yaml --- r: 304373 b: refs/heads/master c:
 41fd935b1812b9d811911a85d5893493f5ec774a h: refs/heads/master i:   304371:
 c8e29a026eaa64c3aeffbef9ea14c5d863bb4d4b v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/staging/iio/iio_simple_dummy.c | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3228ca04c5af..388558835a78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e33e0750826b73ca505244c79152bba1e37c85d0
+refs/heads/master: 41fd935b1812b9d811911a85d5893493f5ec774a
diff --git a/trunk/drivers/staging/iio/iio_simple_dummy.c b/trunk/drivers/staging/iio/iio_simple_dummy.c
index e3a94572bb40..dbeb04c70f0f 100644
--- a/trunk/drivers/staging/iio/iio_simple_dummy.c
+++ b/trunk/drivers/staging/iio/iio_simple_dummy.c
@@ -72,6 +72,12 @@ static struct iio_chan_spec iio_dummy_channels[] = {
 		.channel = 0,
 		/* What other information is available? */
 		.info_mask =
+		/*
+		 * in_voltage0_raw
+		 * Raw (unscaled no bias removal etc) measurement
+		 * from the device.
+		 */
+		IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 		/*
 		 * in_voltage0_offset
 		 * Offset for userspace to apply prior to scale
@@ -113,6 +119,12 @@ static struct iio_chan_spec iio_dummy_channels[] = {
 		.channel = 1,
 		.channel2 = 2,
 		.info_mask =
+		/*
+		 * in_voltage1-voltage2_raw
+		 * Raw (unscaled no bias removal etc) measurement
+		 * from the device.
+		 */
+		IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 		/*
 		 * in_voltage-voltage_scale
 		 * Shared version of scale - shared by differential
@@ -135,6 +147,7 @@ static struct iio_chan_spec iio_dummy_channels[] = {
 		.channel = 3,
 		.channel2 = 4,
 		.info_mask =
+		IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 		IIO_CHAN_INFO_SCALE_SHARED_BIT,
 		.scan_index = diffvoltage3m4,
 		.scan_type = {
@@ -154,6 +167,7 @@ static struct iio_chan_spec iio_dummy_channels[] = {
 		/* Channel 2 is use for modifiers */
 		.channel2 = IIO_MOD_X,
 		.info_mask =
+		IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 		/*
 		 * Internal bias correction value. Applied
 		 * by the hardware or driver prior to userspace
@@ -177,6 +191,7 @@ static struct iio_chan_spec iio_dummy_channels[] = {
 	/* DAC channel out_voltage0_raw */
 	{
 		.type = IIO_VOLTAGE,
+		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
 		.output = 1,
 		.indexed = 1,
 		.channel = 0,
@@ -203,7 +218,7 @@ static int iio_dummy_read_raw(struct iio_dev *indio_dev,
 
 	mutex_lock(&st->lock);
 	switch (mask) {
-	case 0: /* magic value - channel value read */
+	case IIO_CHAN_INFO_RAW: /* magic value - channel value read */
 		switch (chan->type) {
 		case IIO_VOLTAGE:
 			if (chan->output) {
@@ -290,7 +305,7 @@ static int iio_dummy_write_raw(struct iio_dev *indio_dev,
 	struct iio_dummy_state *st = iio_priv(indio_dev);
 
 	switch (mask) {
-	case 0:
+	case IIO_CHAN_INFO_RAW:
 		if (chan->output == 0)
 			return -EINVAL;