Skip to content

Commit

Permalink
iio: adc: Relocate Capacitance to Digital Converters (CDC) into own s…
Browse files Browse the repository at this point in the history
…ubdir

No functional changes.
Fix Kconfig description.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Michael Hennerich authored and Greg Kroah-Hartman committed Oct 19, 2011
1 parent e63abd0 commit 5c48cb9
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 27 deletions.
1 change: 1 addition & 0 deletions drivers/staging/iio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ config IIO_CONSUMERS_PER_TRIGGER
source "drivers/staging/iio/accel/Kconfig"
source "drivers/staging/iio/adc/Kconfig"
source "drivers/staging/iio/addac/Kconfig"
source "drivers/staging/iio/cdc/Kconfig"
source "drivers/staging/iio/dac/Kconfig"
source "drivers/staging/iio/dds/Kconfig"
source "drivers/staging/iio/gyro/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/iio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ obj-$(CONFIG_IIO_DUMMY_EVGEN) += iio_dummy_evgen.o
obj-y += accel/
obj-y += adc/
obj-y += addac/
obj-y += cdc/
obj-y += dac/
obj-y += dds/
obj-y += gyro/
Expand Down
24 changes: 0 additions & 24 deletions drivers/staging/iio/adc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,6 @@
#
menu "Analog to digital converters"

config AD7150
tristate "Analog Devices ad7150/1/6 capacitive sensor driver"
depends on I2C
help
Say yes here to build support for Analog Devices capacitive sensors.
(ad7150, ad7151, ad7156) Provides direct access via sysfs.

config AD7152
tristate "Analog Devices ad7152/3 capacitive sensor driver"
depends on I2C
help
Say yes here to build support for Analog Devices capacitive sensors.
(ad7152, ad7153) Provides direct access via sysfs.

config AD7291
tristate "Analog Devices AD7291 ADC driver"
depends on I2C
Expand Down Expand Up @@ -137,16 +123,6 @@ config AD7793
To compile this driver as a module, choose M here: the
module will be called AD7793.

config AD7746
tristate "Analog Devices AD7745, AD7746 AD7747 capacitive sensor driver"
depends on I2C
help
Say yes here to build support for Analog Devices capacitive sensors.
(AD7745, AD7746, AD7747) Provides direct access via sysfs.

To compile this driver as a module, choose M here: the
module will be called ad7745.

config AD7816
tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
depends on SPI
Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/iio/adc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ ad7298-y := ad7298_core.o
ad7298-$(CONFIG_IIO_BUFFER) += ad7298_ring.o
obj-$(CONFIG_AD7298) += ad7298.o

obj-$(CONFIG_AD7150) += ad7150.o
obj-$(CONFIG_AD7152) += ad7152.o
obj-$(CONFIG_AD7291) += ad7291.o
obj-$(CONFIG_AD7746) += ad7746.o
obj-$(CONFIG_AD7780) += ad7780.o
obj-$(CONFIG_AD7793) += ad7793.o
obj-$(CONFIG_AD7816) += ad7816.o
Expand Down
36 changes: 36 additions & 0 deletions drivers/staging/iio/cdc/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#
# CDC drivers
#
menu "Capacitance to digital converters"

config AD7150
tristate "Analog Devices ad7150/1/6 capacitive sensor driver"
depends on I2C
help
Say yes here to build support for Analog Devices capacitive sensors.
(ad7150, ad7151, ad7156) Provides direct access via sysfs.

To compile this driver as a module, choose M here: the
module will be called ad7150.

config AD7152
tristate "Analog Devices ad7152/3 capacitive sensor driver"
depends on I2C
help
Say yes here to build support for Analog Devices capacitive sensors.
(ad7152, ad7153) Provides direct access via sysfs.

To compile this driver as a module, choose M here: the
module will be called ad7152.

config AD7746
tristate "Analog Devices AD7745, AD7746 AD7747 capacitive sensor driver"
depends on I2C
help
Say yes here to build support for Analog Devices capacitive sensors.
(AD7745, AD7746, AD7747) Provides direct access via sysfs.

To compile this driver as a module, choose M here: the
module will be called ad7746.

endmenu
7 changes: 7 additions & 0 deletions drivers/staging/iio/cdc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# Makefile for industrial I/O DAC drivers
#

obj-$(CONFIG_AD7150) += ad7150.o
obj-$(CONFIG_AD7152) += ad7152.o
obj-$(CONFIG_AD7746) += ad7746.o
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 5c48cb9

Please sign in to comment.