iio: stx104: Move to addac subdirectory

[ Upstream commit 955c2aa9cff2dd07ff798ca8c883398731687972 ]

The stx104 driver supports both ADC and DAC functionality.

Signed-off-by: William Breathitt Gray <william.gray@linaro.org>
Link: https://lore.kernel.org/r/20220815222921.138945-1-william.gray@linaro.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Stable-dep-of: 4f9b80aefb9e ("iio: addac: stx104: Fix race condition when converting analog-to-digital")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index e6b53e76651be624e60905b8cab4fff7e8de36ed..9216b9c85ce92fbcbb65767ddb32291ee6faaf03 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1250,7 +1250,7 @@ APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
 M:     William Breathitt Gray <vilhelm.gray@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
-F:     drivers/iio/adc/stx104.c
+F:     drivers/iio/addac/stx104.c
 
 APM DRIVER
 M:     Jiri Kosina <jikos@kernel.org>

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index af168e1c9fdb55e894d03c81fe48e7ac5a13e72f..86b83dc7b7d99bbb1486f7830087c960ab1f1f22 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -991,22 +991,6 @@ config STMPE_ADC
          Say yes here to build support for ST Microelectronics STMPE
          built-in ADC block (stmpe811).
 
-config STX104
-       tristate "Apex Embedded Systems STX104 driver"
-       depends on PC104 && X86
-       select ISA_BUS_API
-       select GPIOLIB
-       help
-         Say yes here to build support for the Apex Embedded Systems STX104
-         integrated analog PC/104 card.
-
-         This driver supports the 16 channels of single-ended (8 channels of
-         differential) analog inputs, 2 channels of analog output, 4 digital
-         inputs, and 4 digital outputs provided by the STX104.
-
-         The base port addresses for the devices may be configured via the base
-         array module parameter.
-
 config SUN4I_GPADC
        tristate "Support for the Allwinner SoCs GPADC"
        depends on IIO

diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index d68550f493e344c3ee8ad97a84797c0acb21940f..13668c4cfbaf66f3add37a32164cdac284cb30e4 100644 (file)
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -85,7 +85,6 @@ obj-$(CONFIG_ROCKCHIP_SARADC) += rockchip_saradc.o
 obj-$(CONFIG_RZG2L_ADC) += rzg2l_adc.o
 obj-$(CONFIG_SC27XX_ADC) += sc27xx_adc.o
 obj-$(CONFIG_SPEAR_ADC) += spear_adc.o
-obj-$(CONFIG_STX104) += stx104.o
 obj-$(CONFIG_SUN4I_GPADC) += sun4i-gpadc-iio.o
 obj-$(CONFIG_STM32_ADC_CORE) += stm32-adc-core.o
 obj-$(CONFIG_STM32_ADC) += stm32-adc.o

diff --git a/drivers/iio/addac/Kconfig b/drivers/iio/addac/Kconfig
index 2e64d7755d5ea3b99305226b692bdbb7cfb3450a..1f598670e84fbbd06b120ea37d38f6d31bed824f 100644 (file)
--- a/drivers/iio/addac/Kconfig
+++ b/drivers/iio/addac/Kconfig
@@ -5,4 +5,20 @@
 
 menu "Analog to digital and digital to analog converters"
 
+config STX104
+       tristate "Apex Embedded Systems STX104 driver"
+       depends on PC104 && X86
+       select ISA_BUS_API
+       select GPIOLIB
+       help
+         Say yes here to build support for the Apex Embedded Systems STX104
+         integrated analog PC/104 card.
+
+         This driver supports the 16 channels of single-ended (8 channels of
+         differential) analog inputs, 2 channels of analog output, 4 digital
+         inputs, and 4 digital outputs provided by the STX104.
+
+         The base port addresses for the devices may be configured via the base
+         array module parameter.
+
 endmenu

diff --git a/drivers/iio/addac/Makefile b/drivers/iio/addac/Makefile
index b888b9ee12da0c03fe1026f2ba1609b32f0f19b7..8629145233544a79603ec9ba22944c7b82b243f5 100644 (file)
--- a/drivers/iio/addac/Makefile
+++ b/drivers/iio/addac/Makefile
@@ -4,3 +4,4 @@
 #
 
 # When adding new entries keep the list in alphabetical order
+obj-$(CONFIG_STX104) += stx104.o

diff --git a/drivers/iio/adc/stx104.c b/drivers/iio/addac/stx104.c
similarity index 100%
rename from drivers/iio/adc/stx104.c
rename to drivers/iio/addac/stx104.c