diff options
| author | Shreeya Patel <shreeya.patel23498@gmail.com> | 2018-03-29 14:52:51 +0530 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2018-03-30 13:50:36 +0100 |
| commit | 524c762844fede91df23a14231213b5a0c2562f1 (patch) | |
| tree | 276e8d3816d2f2dc6cfddbc4be84738e1f2a53dc | |
| parent | abb07089b53862ce5de5316590eb3cf2afa7518e (diff) | |
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: Shreeya Patel <shreeya.patel23498@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
| -rw-r--r-- | drivers/iio/accel/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/iio/accel/Makefile | 1 | ||||
| -rw-r--r-- | drivers/iio/accel/adis16209.c (renamed from drivers/staging/iio/accel/adis16209.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/accel/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/staging/iio/accel/Makefile | 1 |
5 files changed, 14 insertions, 14 deletions
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index 9416c6f9366a..62ae7e5abcfa 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -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 diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile index 7832ec9adb2d..636d4d1b2990 100644 --- a/drivers/iio/accel/Makefile +++ b/drivers/iio/accel/Makefile @@ -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 diff --git a/drivers/staging/iio/accel/adis16209.c b/drivers/iio/accel/adis16209.c index fd1d89cbf50e..f2dc3a5f0463 100644 --- a/drivers/staging/iio/accel/adis16209.c +++ b/drivers/iio/accel/adis16209.c @@ -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; diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig index 2f61e2124ba6..befbbfe911c2 100644 --- a/drivers/staging/iio/accel/Kconfig +++ b/drivers/staging/iio/accel/Kconfig @@ -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 diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile index 7dd554106789..773212e0c859 100644 --- a/drivers/staging/iio/accel/Makefile +++ b/drivers/staging/iio/accel/Makefile @@ -3,5 +3,4 @@ # obj-$(CONFIG_ADIS16203) += adis16203.o -obj-$(CONFIG_ADIS16209) += adis16209.o obj-$(CONFIG_ADIS16240) += adis16240.o |