iio: stx104: Move to addac subdirectory

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>

diff --git a/MAINTAINERS b/MAINTAINERS
index a88edf508003a88ee2546be57d3b24cd438f93f3..7dcae9243256392cf339097e6e8dfe757a2af573 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1374,7 +1374,7 @@ APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
 M:     William Breathitt Gray <william.gray@linaro.org>
 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 5a3e8d9ae26c8056361f8252f968c6dca2b349e1..e3c2881ed23ab5c4ffa90b0ab79cbb9376a7d994 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -1037,22 +1037,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 c1a861a978ad152f36bf4ca58bfdab4ddc5203f0..ab084094263bb2f6a015c7eb17605bd5625d1f62 100644 (file)
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -89,7 +89,6 @@ obj-$(CONFIG_RICHTEK_RTQ6056) += rtq6056.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 138492362f20974752a8b6eb1c50c55c07a0415a..fcf6d2269bfc25d9f497a25ef4ccf3ae5018e63a 100644 (file)
--- a/drivers/iio/addac/Kconfig
+++ b/drivers/iio/addac/Kconfig
@@ -17,4 +17,20 @@ config AD74413R
          To compile this driver as a module, choose M here: the
          module will be called ad74413r.
 
+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 cfd4bbe64ad3b506e3b4ccbf7cea239a540b6a2c..17de20ef0d8e9df868a33076b537e56f1ef2ee0f 100644 (file)
--- a/drivers/iio/addac/Makefile
+++ b/drivers/iio/addac/Makefile
@@ -5,3 +5,4 @@
 
 # When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AD74413R) += ad74413r.o
+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