Skip to content

Commit 591298e

Browse files
himanshujha199640jic23
authored andcommitted
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: Himanshu Jha <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
1 parent 6988a80 commit 591298e

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

drivers/iio/accel/Kconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@
55

66
menu "Accelerometers"
77

8+
config ADIS16201
9+
tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"
10+
depends on SPI
11+
select IIO_ADIS_LIB
12+
select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
13+
help
14+
Say Y here to build support for Analog Devices adis16201 dual-axis
15+
digital inclinometer and accelerometer.
16+
17+
To compile this driver as a module, say M here: the module will
18+
be called adis16201.
19+
820
config ADXL345
921
tristate
1022

drivers/iio/accel/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#
55

66
# When adding new entries keep the list in alphabetical order
7+
obj-$(CONFIG_ADIS16201) += adis16201.o
78
obj-$(CONFIG_ADXL345) += adxl345_core.o
89
obj-$(CONFIG_ADXL345_I2C) += adxl345_i2c.o
910
obj-$(CONFIG_ADXL345_SPI) += adxl345_spi.o
File renamed without changes.

drivers/staging/iio/accel/Kconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,6 @@
33
#
44
menu "Accelerometers"
55

6-
config ADIS16201
7-
tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"
8-
depends on SPI
9-
select IIO_ADIS_LIB
10-
select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
11-
help
12-
Say Y here to build support for Analog Devices adis16201 dual-axis
13-
digital inclinometer and accelerometer.
14-
15-
To compile this driver as a module, say M here: the module will
16-
be called adis16201.
17-
186
config ADIS16203
197
tristate "Analog Devices ADIS16203 Programmable 360 Degrees Inclinometer"
208
depends on SPI

drivers/staging/iio/accel/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Makefile for industrial I/O accelerometer drivers
33
#
44

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

0 commit comments

Comments
 (0)