Commit 2b0c856a authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

staging:iio: Consolidate adt7310 and adt7410 driver 



The adt7310 is the SPI version of the adt7410, so there is no need to have a
separate driver for it. The register map layout is a bit different, i.e. the
addresses of the register differ, but the individual register layouts are
identical. We solve this by adding a small look-up table, which translates
adt7410 register addresses to ad7310 register addresses.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent e446f5a8

drivers/staging/iio/adc/Kconfig

+3 −10
Original line number Diff line number Diff line
@@ -126,18 +126,11 @@ config AD7192 
	  To compile this driver as a module, choose M here: the

	  module will be called ad7192.



config ADT7310

	tristate "Analog Devices ADT7310 temperature sensor driver"

	depends on SPI

	help

	  Say yes here to build support for Analog Devices ADT7310

	  temperature sensors.



config ADT7410

	tristate "Analog Devices ADT7410 temperature sensor driver"

	depends on I2C

	tristate "Analog Devices ADT7310/ADT7410 temperature sensor driver"

	depends on I2C || SPI_MASTER

	help

	  Say yes here to build support for Analog Devices ADT7410

	  Say yes here to build support for Analog Devices ADT7310/ADT7410

	  temperature sensors.



config AD7280

drivers/staging/iio/adc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ obj-$(CONFIG_AD7780) += ad7780.o 
obj-$(CONFIG_AD7793) += ad7793.o

obj-$(CONFIG_AD7816) += ad7816.o

obj-$(CONFIG_AD7192) += ad7192.o

obj-$(CONFIG_ADT7310) += adt7310.o

obj-$(CONFIG_ADT7410) += adt7410.o

obj-$(CONFIG_AD7280) += ad7280a.o

obj-$(CONFIG_LPC32XX_ADC) += lpc32xx_adc.o

drivers/staging/iio/adc/adt7310.c

deleted100644 → 0
+0 −881

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/staging/iio/adc/adt7410.c

+361 −97

File changed.

Preview size limit exceeded, changes collapsed.