Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 524c7628 authored by Shreeya Patel's avatar Shreeya Patel Committed by Jonathan Cameron
Browse files

Staging: iio: adis16209: Move adis16209 driver out of staging 



Move the adis16209 driver out of staging directory and merge to the
mainline IIO subsystem.

Signed-off-by: default avatarShreeya Patel <shreeya.patel23498@gmail.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent abb07089

drivers/iio/accel/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,18 @@ config ADIS16201 
          To compile this driver as a module, say M here: the module will

          be called adis16201.



config ADIS16209

        tristate "Analog Devices ADIS16209 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 adis16209 dual-axis digital inclinometer

          and accelerometer.



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

          called adis16209.



config ADXL345

	tristate

drivers/iio/accel/Makefile

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


# When adding new entries keep the list in alphabetical order

obj-$(CONFIG_ADIS16201) += adis16201.o

obj-$(CONFIG_ADIS16209) += adis16209.o

obj-$(CONFIG_ADXL345) += adxl345_core.o

obj-$(CONFIG_ADXL345_I2C) += adxl345_i2c.o

obj-$(CONFIG_ADXL345_SPI) += adxl345_spi.o

drivers/staging/iio/accel/adis16209.c→drivers/iio/accel/adis16209.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int adis16209_read_raw(struct iio_dev *indio_dev, 
	case IIO_CHAN_INFO_OFFSET:

		/*

		 * The raw ADC value is 0x4FE when the temperature

		 * is 25 degrees and the scale factor per milli

		 * is 45 degrees and the scale factor per milli

		 * degree celcius is -470.

		 */

		*val = 25000 / -470 - 0x4FE;

drivers/staging/iio/accel/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -15,18 +15,6 @@ config ADIS16203 
	  To compile this driver as a module, say M here: the module will be

	  called adis16203.



config ADIS16209

	tristate "Analog Devices ADIS16209 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 adis16209 dual-axis digital inclinometer

	  and accelerometer.



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

	  called adis16209.



config ADIS16240

	tristate "Analog Devices ADIS16240 Programmable Impact Sensor and Recorder"

	depends on SPI

drivers/staging/iio/accel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,5 +3,4 @@ 
#



obj-$(CONFIG_ADIS16203) += adis16203.o

obj-$(CONFIG_ADIS16209) += adis16209.o

obj-$(CONFIG_ADIS16240) += adis16240.o