---

yaml --- r: 354200 b: refs/heads/master c: d6b09bd h: refs/heads/master v: v3
git-mirror · Jan 26, 2013 · f0534fb · f0534fb
1 parent 97b4da0
commit f0534fb
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4c6d64bcf5b4bd868c53c6943d9b9bdd65eaa48
+refs/heads/master: d6b09bd85d57752395c6407bd8a9b32eb7b279ff
diff --git a/trunk/drivers/iio/imu/Kconfig b/trunk/drivers/iio/imu/Kconfig
@@ -3,6 +3,17 @@
 #
 menu "Inertial measurement units"
 
+config ADIS16400
+	tristate "Analog Devices ADIS16400 and similar IMU SPI driver"
+	depends on SPI
+	select IIO_ADIS_LIB
+	select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
+	help
+	  Say yes here to build support for Analog Devices adis16300, adis16344,
+	  adis16350, adis16354, adis16355, adis16360, adis16362, adis16364,
+	  adis16365, adis16400 and adis16405 triaxial inertial sensors
+	  (adis16400 series also have magnetometers).
+
 config ADIS16480
 	tristate "Analog Devices ADIS16480 and similar IMU driver"
 	depends on SPI

diff --git a/trunk/drivers/iio/imu/Makefile b/trunk/drivers/iio/imu/Makefile
@@ -2,6 +2,9 @@
 # Makefile for Inertial Measurement Units
 #
 
+adis16400-y             := adis16400_core.o
+adis16400-$(CONFIG_IIO_BUFFER) += adis16400_buffer.o
+obj-$(CONFIG_ADIS16400) += adis16400.o
 obj-$(CONFIG_ADIS16480) += adis16480.o
 
 adis_lib-y += adis.o

diff --git a/trunk/drivers/staging/iio/imu/adis16400.h → trunk/drivers/iio/imu/adis16400.h b/trunk/drivers/staging/iio/imu/adis16400.h → trunk/drivers/iio/imu/adis16400.h
diff --git a/.../drivers/staging/iio/imu/adis16400_ring.c → trunk/drivers/iio/imu/adis16400_buffer.c b/.../drivers/staging/iio/imu/adis16400_ring.c → trunk/drivers/iio/imu/adis16400_buffer.c
diff --git a/.../drivers/staging/iio/imu/adis16400_core.c → trunk/drivers/iio/imu/adis16400_core.c b/.../drivers/staging/iio/imu/adis16400_core.c → trunk/drivers/iio/imu/adis16400_core.c
diff --git a/trunk/drivers/staging/iio/Kconfig b/trunk/drivers/staging/iio/Kconfig
@@ -32,7 +32,6 @@ source "drivers/staging/iio/cdc/Kconfig"
 source "drivers/staging/iio/frequency/Kconfig"
 source "drivers/staging/iio/gyro/Kconfig"
 source "drivers/staging/iio/impedance-analyzer/Kconfig"
-source "drivers/staging/iio/imu/Kconfig"
 source "drivers/staging/iio/light/Kconfig"
 source "drivers/staging/iio/magnetometer/Kconfig"
 source "drivers/staging/iio/meter/Kconfig"

diff --git a/trunk/drivers/staging/iio/Makefile b/trunk/drivers/staging/iio/Makefile
@@ -20,7 +20,6 @@ obj-y += cdc/
 obj-y += frequency/
 obj-y += gyro/
 obj-y += impedance-analyzer/
-obj-y += imu/
 obj-y += light/
 obj-y += magnetometer/
 obj-y += meter/

diff --git a/trunk/drivers/staging/iio/imu/Kconfig b/trunk/drivers/staging/iio/imu/Kconfig
diff --git a/trunk/drivers/staging/iio/imu/Makefile b/trunk/drivers/staging/iio/imu/Makefile