Title: [8665] trunk/drivers/staging/iio/imu: adis16300: fix ring buffer according to test
Revision
8665
Author
bhsong
Date
2010-04-26 00:05:08 -0400 (Mon, 26 Apr 2010)

Log Message

adis16300: fix ring buffer according to test

Modified Paths


Diff

Modified: trunk/drivers/staging/iio/imu/adis16300.h (8664 => 8665)


--- trunk/drivers/staging/iio/imu/adis16300.h	2010-04-23 18:16:17 UTC (rev 8664)
+++ trunk/drivers/staging/iio/imu/adis16300.h	2010-04-26 04:05:08 UTC (rev 8665)
@@ -83,8 +83,8 @@
 /* SLP_CNT */
 #define ADIS16300_SLP_CNT_POWER_OFF	(1<<8)
 
-#define ADIS16300_MAX_TX 24
-#define ADIS16300_MAX_RX 24
+#define ADIS16300_MAX_TX 18
+#define ADIS16300_MAX_RX 18
 
 #define ADIS16300_SPI_SLOW	(u32)(300 * 1000)
 #define ADIS16300_SPI_BURST	(u32)(1000 * 1000)

Modified: trunk/drivers/staging/iio/imu/adis16300_core.c (8664 => 8665)


--- trunk/drivers/staging/iio/imu/adis16300_core.c	2010-04-23 18:16:17 UTC (rev 8664)
+++ trunk/drivers/staging/iio/imu/adis16300_core.c	2010-04-26 04:05:08 UTC (rev 8665)
@@ -174,8 +174,8 @@
 		}, {
 			.rx_buf = rx,
 			.bits_per_word = 8,
-			.len = 24,
-			.cs_change = 1,
+			.len = 18,
+			.cs_change = 0,
 		},
 	};
 
@@ -429,6 +429,7 @@
 		goto error_ret;
 
 	msc |= ADIS16300_MSC_CTRL_DATA_RDY_POL_HIGH;
+	msc &= ~ADIS16300_MSC_CTRL_DATA_RDY_DIO2;
 	if (enable)
 		msc |= ADIS16300_MSC_CTRL_DATA_RDY_EN;
 	else

Modified: trunk/drivers/staging/iio/imu/adis16300_ring.c (8664 => 8665)


--- trunk/drivers/staging/iio/imu/adis16300_ring.c	2010-04-23 18:16:17 UTC (rev 8664)
+++ trunk/drivers/staging/iio/imu/adis16300_ring.c	2010-04-26 04:05:08 UTC (rev 8665)
@@ -140,7 +140,7 @@
 	if (indio_dev->ring->access.set_bpd) {
 		if (indio_dev->scan_timestamp)
 			if (indio_dev->scan_count) /* Timestamp and data */
-				size = 6*sizeof(s64);
+				size = 4*sizeof(s64);
 			else /* Timestamp only  */
 				size = sizeof(s64);
 		else /* Data only */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to