[3.11.y.z extended stable] Patch "iio: ti_am335x_adc: Fix: Use same step id at FIFOs both ends" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    iio: ti_am335x_adc: Fix: Use same step id at FIFOs both ends

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 96a512d0a2c3a1d42e024f8c604734be69228809 Mon Sep 17 00:00:00 2001
From: Jan Kardell <jan.kardell at telliq.com>
Date: Thu, 6 Nov 2014 22:18:00 +0000
Subject: [PATCH 28/41] iio: ti_am335x_adc: Fix: Use same step id at FIFOs both
 ends

commit baa3c65298c089a9014b4e523a14ec2885cca1bc upstream.

Since AI lines could be selected at will (linux-3.11) the sending
and receiving ends of the FIFO does not agree about what step is used
for a line. It only works if the last lines are used, like 5,6,7,
and fails if ie 2,4,6 is selected in DT.

Signed-off-by: Jan Kardell <jan.kardell at telliq.com>
Tested-by: Zubair Lutfullah <zubair.lutfullah at gmail.com>
Signed-off-by: Jonathan Cameron <jic23 at kernel.org>
[ luis: backported to 3.11: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/iio/adc/ti_am335x_adc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 3ceac3e91dde..9dd72d05abc3 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -155,7 +155,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
 		if (time_after(jiffies, timeout))
 			return -EAGAIN;
 		}
-	map_val = chan->channel + TOTAL_CHANNELS;
+	map_val = adc_dev->channel_step[chan->scan_index];

 	/*
 	 * When the sub-system is first enabled,
--
1.9.1