diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-01-16 12:48:00 +0000 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-01-26 10:07:50 +0000 |
| commit | d6b09bd85d57752395c6407bd8a9b32eb7b279ff (patch) | |
| tree | 0ad920d6cd805a5e3a357bb678fcd0a1678fc9ea | |
| parent | f4c6d64bcf5b4bd868c53c6943d9b9bdd65eaa48 (diff) | |
| download | linux-stable-d6b09bd85d57752395c6407bd8a9b32eb7b279ff.tar.gz linux-stable-d6b09bd85d57752395c6407bd8a9b32eb7b279ff.tar.bz2 linux-stable-d6b09bd85d57752395c6407bd8a9b32eb7b279ff.zip | |
staging:iio: Move adis16400 out of staging
This adis16400 driver is in pretty good shape now, so move it out of staging.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/imu/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/iio/imu/Makefile | 3 | ||||
| -rw-r--r-- | drivers/iio/imu/adis16400.h (renamed from drivers/staging/iio/imu/adis16400.h) | 0 | ||||
| -rw-r--r-- | drivers/iio/imu/adis16400_buffer.c (renamed from drivers/staging/iio/imu/adis16400_ring.c) | 0 | ||||
| -rw-r--r-- | drivers/iio/imu/adis16400_core.c (renamed from drivers/staging/iio/imu/adis16400_core.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/iio/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/staging/iio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/iio/imu/Kconfig | 17 | ||||
| -rw-r--r-- | drivers/staging/iio/imu/Makefile | 7 |
9 files changed, 14 insertions, 26 deletions
diff --git a/drivers/iio/imu/Kconfig b/drivers/iio/imu/Kconfig index 3d79a40e916b..47f66ed9c4ef 100644 --- a/drivers/iio/imu/Kconfig +++ b/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/drivers/iio/imu/Makefile b/drivers/iio/imu/Makefile index cfe57638f6f9..019b717c5ff1 100644 --- a/drivers/iio/imu/Makefile +++ b/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/drivers/staging/iio/imu/adis16400.h b/drivers/iio/imu/adis16400.h index a3b9e56c5bd1..a3b9e56c5bd1 100644 --- a/drivers/staging/iio/imu/adis16400.h +++ b/drivers/iio/imu/adis16400.h diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/iio/imu/adis16400_buffer.c index 054c01d6e73c..054c01d6e73c 100644 --- a/drivers/staging/iio/imu/adis16400_ring.c +++ b/drivers/iio/imu/adis16400_buffer.c diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c index 1bbe5eed0139..1bbe5eed0139 100644 --- a/drivers/staging/iio/imu/adis16400_core.c +++ b/drivers/iio/imu/adis16400_core.c diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig index ca56c75a35fc..94d60d5d60c8 100644 --- a/drivers/staging/iio/Kconfig +++ b/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/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile index fa6937d92ee3..468b7f8d2d62 100644 --- a/drivers/staging/iio/Makefile +++ b/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/drivers/staging/iio/imu/Kconfig b/drivers/staging/iio/imu/Kconfig deleted file mode 100644 index 096afc8cd87e..000000000000 --- a/drivers/staging/iio/imu/Kconfig +++ /dev/null @@ -1,17 +0,0 @@ -# -# IIO imu drivers configuration -# -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). - -endmenu diff --git a/drivers/staging/iio/imu/Makefile b/drivers/staging/iio/imu/Makefile deleted file mode 100644 index c9988f6077ff..000000000000 --- a/drivers/staging/iio/imu/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for Inertial Measurement Units -# - -adis16400-y := adis16400_core.o -adis16400-$(CONFIG_IIO_BUFFER) += adis16400_ring.o -obj-$(CONFIG_ADIS16400) += adis16400.o |