Commit 591298e5 authored by Himanshu Jha's avatar Himanshu Jha Committed by Jonathan Cameron
Browse files

Staging: iio: accel: adis16201: Move adis16201 driver out of staging



Move adis16201 driver out of staging and merge into mainline
IIO subsystem.

Signed-off-by: default avatarHimanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 6988a80a
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -5,6 +5,18 @@

menu "Accelerometers"

config ADIS16201
        tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"
        depends on SPI
        select IIO_ADIS_LIB
        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
        help
          Say Y here to build support for Analog Devices adis16201 dual-axis
          digital inclinometer and accelerometer.

          To compile this driver as a module, say M here: the module will
          be called adis16201.

config ADXL345
	tristate

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
#

# When adding new entries keep the list in alphabetical order
obj-$(CONFIG_ADIS16201) += adis16201.o
obj-$(CONFIG_ADXL345) += adxl345_core.o
obj-$(CONFIG_ADXL345_I2C) += adxl345_i2c.o
obj-$(CONFIG_ADXL345_SPI) += adxl345_spi.o
+0 −12
Original line number Diff line number Diff line
@@ -3,18 +3,6 @@
#
menu "Accelerometers"

config ADIS16201
	tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"
	depends on SPI
	select IIO_ADIS_LIB
	select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
	help
	  Say Y here to build support for Analog Devices adis16201 dual-axis
	  digital inclinometer and accelerometer.

	  To compile this driver as a module, say M here: the module will
	  be called adis16201.

config ADIS16203
	tristate "Analog Devices ADIS16203 Programmable 360 Degrees Inclinometer"
	depends on SPI
+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
# Makefile for industrial I/O accelerometer drivers
#

obj-$(CONFIG_ADIS16201) += adis16201.o
obj-$(CONFIG_ADIS16203) += adis16203.o
obj-$(CONFIG_ADIS16209) += adis16209.o
obj-$(CONFIG_ADIS16240) += adis16240.o