From 33de1f63c8006827b954f6e7b2ad3f4a31f575d7 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri, 15 Jun 2012 18:11:52 +0200
Subject: [PATCH] --- yaml --- r: 317389 b: refs/heads/master c:
 07a8329c48b699a85086756eaa1a658540d02ac4 h: refs/heads/master i:   317387:
 0ea6add9a37f7076ed5b0908e9ab94df7369ec48 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/iio/imu/adis16400.h      | 1 +
 trunk/drivers/staging/iio/imu/adis16400_core.c | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f63db960c8e0..7bdc492d8faa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb7cf8bc52ff388c89f5984e428e966e326315ad
+refs/heads/master: 07a8329c48b699a85086756eaa1a658540d02ac4
diff --git a/trunk/drivers/staging/iio/imu/adis16400.h b/trunk/drivers/staging/iio/imu/adis16400.h
index 1f4e98783ef5..9dd9f1459a4d 100644
--- a/trunk/drivers/staging/iio/imu/adis16400.h
+++ b/trunk/drivers/staging/iio/imu/adis16400.h
@@ -43,6 +43,7 @@
 
 #define ADIS16300_PITCH_OUT 0x12 /* X axis inclinometer output measurement */
 #define ADIS16300_ROLL_OUT  0x14 /* Y axis inclinometer output measurement */
+#define ADIS16300_AUX_ADC   0x16 /* Auxiliary ADC measurement */
 
 /* Calibration parameters */
 #define ADIS16400_XGYRO_OFF 0x1A /* X-axis gyroscope bias offset factor */
diff --git a/trunk/drivers/staging/iio/imu/adis16400_core.c b/trunk/drivers/staging/iio/imu/adis16400_core.c
index 7aa3a9aa55e4..387301437cf5 100644
--- a/trunk/drivers/staging/iio/imu/adis16400_core.c
+++ b/trunk/drivers/staging/iio/imu/adis16400_core.c
@@ -472,11 +472,12 @@ enum adis16400_chan {
 	temp,
 	temp0, temp1, temp2,
 	in1,
+	in2,
 	incli_x,
 	incli_y,
 };
 
-static u8 adis16400_addresses[17][2] = {
+static u8 adis16400_addresses[18][2] = {
 	[in_supply] = { ADIS16400_SUPPLY_OUT },
 	[gyro_x] = { ADIS16400_XGYRO_OUT, ADIS16400_XGYRO_OFF },
 	[gyro_y] = { ADIS16400_YGYRO_OUT, ADIS16400_YGYRO_OFF },
@@ -491,7 +492,8 @@ static u8 adis16400_addresses[17][2] = {
 	[temp0] = { ADIS16350_XTEMP_OUT },
 	[temp1] = { ADIS16350_YTEMP_OUT },
 	[temp2] = { ADIS16350_ZTEMP_OUT },
-	[in1] = { ADIS16400_AUX_ADC },
+	[in1] = { ADIS16300_AUX_ADC },
+	[in2] = { ADIS16400_AUX_ADC },
 	[incli_x] = { ADIS16300_PITCH_OUT },
 	[incli_y] = { ADIS16300_ROLL_OUT }
 };
@@ -752,7 +754,7 @@ static struct iio_chan_spec adis16400_channels[] = {
 		.channel = 1,
 		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 		IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-		.address = in1,
+		.address = in2,
 		.scan_index = ADIS16400_SCAN_ADC_0,
 		.scan_type = IIO_ST('s', 12, 16, 0),
 	},