public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-18 04:35:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Shreeya Patel 2018-03-29 14:52:51 +05:30 • committed by Jonathan Cameron
parent abb07089b5
commit 524c762844
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/iio/accel/Kconfig
View file

@ -17,6 +17,18 @@ config ADIS16201
To compile this driver as a module, say M here: the module will To compile this driver as a module, say M here: the module will
be called adis16201. 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 config ADXL345
tristate tristate

1
drivers/iio/accel/Makefile
View file

@ -5,6 +5,7 @@
# When adding new entries keep the list in alphabetical order # When adding new entries keep the list in alphabetical order
obj-$(CONFIG_ADIS16201) += adis16201.o obj-$(CONFIG_ADIS16201) += adis16201.o
obj-$(CONFIG_ADIS16209) += adis16209.o
obj-$(CONFIG_ADXL345) += adxl345_core.o obj-$(CONFIG_ADXL345) += adxl345_core.o
obj-$(CONFIG_ADXL345_I2C) += adxl345_i2c.o obj-$(CONFIG_ADXL345_I2C) += adxl345_i2c.o
obj-$(CONFIG_ADXL345_SPI) += adxl345_spi.o obj-$(CONFIG_ADXL345_SPI) += adxl345_spi.o

2
drivers/staging/iio/accel/adis16209.c → drivers/iio/accel/adis16209.c
View file

@ -189,7 +189,7 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_OFFSET: case IIO_CHAN_INFO_OFFSET:
/* /*
* The raw ADC value is 0x4FE when the temperature * 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. * degree celcius is -470.
*/ */
*val = 25000 / -470 - 0x4FE; *val = 25000 / -470 - 0x4FE;

12
drivers/staging/iio/accel/Kconfig
View file

@ -15,18 +15,6 @@ config ADIS16203
To compile this driver as a module, say M here: the module will be To compile this driver as a module, say M here: the module will be
called adis16203. 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 config ADIS16240
tristate "Analog Devices ADIS16240 Programmable Impact Sensor and Recorder" tristate "Analog Devices ADIS16240 Programmable Impact Sensor and Recorder"
depends on SPI depends on SPI

1
drivers/staging/iio/accel/Makefile
View file

@ -3,5 +3,4 @@
# #
obj-$(CONFIG_ADIS16203) += adis16203.o obj-$(CONFIG_ADIS16203) += adis16203.o
obj-$(CONFIG_ADIS16209) += adis16209.o
obj-$(CONFIG_ADIS16240) += adis16240.o obj-$(CONFIG_ADIS16240) += adis16240.o