diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iio/resolver/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/iio/resolver/Makefile | 1 | ||||
| -rw-r--r-- | drivers/iio/resolver/ad2s1210.c (renamed from drivers/staging/iio/resolver/ad2s1210.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/iio/Documentation/sysfs-bus-iio-resolver-ad2s1210 | 27 | ||||
| -rw-r--r-- | drivers/staging/iio/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/staging/iio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/iio/resolver/Kconfig | 19 | ||||
| -rw-r--r-- | drivers/staging/iio/resolver/Makefile | 6 |
8 files changed, 14 insertions, 54 deletions
diff --git a/drivers/iio/resolver/Kconfig b/drivers/iio/resolver/Kconfig index 47dbfead9b31..424529d36080 100644 --- a/drivers/iio/resolver/Kconfig +++ b/drivers/iio/resolver/Kconfig @@ -25,4 +25,17 @@ config AD2S1200 To compile this driver as a module, choose M here: the module will be called ad2s1200. + +config AD2S1210 + tristate "Analog Devices ad2s1210 driver" + depends on SPI + depends on COMMON_CLK + depends on GPIOLIB || COMPILE_TEST + help + Say yes here to build support for Analog Devices spi resolver + to digital converters, ad2s1210, provides direct access via sysfs. + + To compile this driver as a module, choose M here: the + module will be called ad2s1210. + endmenu diff --git a/drivers/iio/resolver/Makefile b/drivers/iio/resolver/Makefile index fa558138ce45..7f6c876c35ae 100644 --- a/drivers/iio/resolver/Makefile +++ b/drivers/iio/resolver/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_AD2S90) += ad2s90.o obj-$(CONFIG_AD2S1200) += ad2s1200.o +obj-$(CONFIG_AD2S1210) += ad2s1210.o diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/iio/resolver/ad2s1210.c index bd4a90c222b5..bd4a90c222b5 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/iio/resolver/ad2s1210.c diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-resolver-ad2s1210 b/drivers/staging/iio/Documentation/sysfs-bus-iio-resolver-ad2s1210 deleted file mode 100644 index f92c79342b93..000000000000 --- a/drivers/staging/iio/Documentation/sysfs-bus-iio-resolver-ad2s1210 +++ /dev/null @@ -1,27 +0,0 @@ -What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltage0_mag_rising_reset_max -KernelVersion: 6.7 -Contact: linux-iio@vger.kernel.org -Description: - Reading returns the current Degradation of Signal Reset Maximum - Threshold value in millivolts. Writing sets the value. - -What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltage0_mag_rising_reset_max_available -KernelVersion: 6.7 -Contact: linux-iio@vger.kernel.org -Description: - Reading returns the allowable voltage range for - in_altvoltage0_mag_rising_reset_max. - -What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltage0_mag_rising_reset_min -KernelVersion: 6.7 -Contact: linux-iio@vger.kernel.org -Description: - Reading returns the current Degradation of Signal Reset Minimum - Threshold value in millivolts. Writing sets the value. - -What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltage0_mag_rising_reset_min_available -KernelVersion: 6.7 -Contact: linux-iio@vger.kernel.org -Description: - Reading returns the allowable voltage range for - in_altvoltage0_mag_rising_reset_min. diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig index d3968fe2ebb8..a60631c1f449 100644 --- a/drivers/staging/iio/Kconfig +++ b/drivers/staging/iio/Kconfig @@ -10,6 +10,5 @@ source "drivers/staging/iio/adc/Kconfig" source "drivers/staging/iio/addac/Kconfig" source "drivers/staging/iio/frequency/Kconfig" source "drivers/staging/iio/impedance-analyzer/Kconfig" -source "drivers/staging/iio/resolver/Kconfig" endmenu diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile index c50f1019f829..628583535393 100644 --- a/drivers/staging/iio/Makefile +++ b/drivers/staging/iio/Makefile @@ -8,4 +8,3 @@ obj-y += adc/ obj-y += addac/ obj-y += frequency/ obj-y += impedance-analyzer/ -obj-y += resolver/ diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig deleted file mode 100644 index bebb35822c9e..000000000000 --- a/drivers/staging/iio/resolver/Kconfig +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Resolver/Synchro drivers -# -menu "Resolver to digital converters" - -config AD2S1210 - tristate "Analog Devices ad2s1210 driver" - depends on SPI - depends on COMMON_CLK - depends on GPIOLIB || COMPILE_TEST - help - Say yes here to build support for Analog Devices spi resolver - to digital converters, ad2s1210, provides direct access via sysfs. - - To compile this driver as a module, choose M here: the - module will be called ad2s1210. - -endmenu diff --git a/drivers/staging/iio/resolver/Makefile b/drivers/staging/iio/resolver/Makefile deleted file mode 100644 index 398631f7e79b..000000000000 --- a/drivers/staging/iio/resolver/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Makefile for Resolver/Synchro drivers -# - -obj-$(CONFIG_AD2S1210) += ad2s1210.o |