| Message ID | 20220815222921.138945-1-william.gray@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: stx104: Move to addac subdirectory | expand |
On Mon, 15 Aug 2022 18:29:21 -0400 William Breathitt Gray <william.gray@linaro.org> wrote: > The stx104 driver supports both ADC and DAC functionality. > > Signed-off-by: William Breathitt Gray <william.gray@linaro.org> I don't care enough to audit all drivers and move them, but I'm fine with individual driver maintainers deciding they should be in a different category. Applied. Thanks, > --- > MAINTAINERS | 2 +- > drivers/iio/adc/Kconfig | 16 ---------------- > drivers/iio/adc/Makefile | 1 - > drivers/iio/addac/Kconfig | 16 ++++++++++++++++ > drivers/iio/addac/Makefile | 1 + > drivers/iio/{adc => addac}/stx104.c | 0 > 6 files changed, 18 insertions(+), 18 deletions(-) > rename drivers/iio/{adc => addac}/stx104.c (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index b8b6544ba27c..f4ef070f474a 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1382,7 +1382,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 5a3e8d9ae26c..e3c2881ed23a 100644 > --- 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 c1a861a978ad..ab084094263b 100644 > --- 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 138492362f20..fcf6d2269bfc 100644 > --- 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 cfd4bbe64ad3..17de20ef0d8e 100644 > --- 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 > > base-commit: b82217e73b5aa6db8453ad91b929ca2366e47184
diff --git a/MAINTAINERS b/MAINTAINERS index b8b6544ba27c..f4ef070f474a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1382,7 +1382,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 5a3e8d9ae26c..e3c2881ed23a 100644 --- 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 c1a861a978ad..ab084094263b 100644 --- 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 138492362f20..fcf6d2269bfc 100644 --- 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 cfd4bbe64ad3..17de20ef0d8e 100644 --- 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
The stx104 driver supports both ADC and DAC functionality. Signed-off-by: William Breathitt Gray <william.gray@linaro.org> --- MAINTAINERS | 2 +- drivers/iio/adc/Kconfig | 16 ---------------- drivers/iio/adc/Makefile | 1 - drivers/iio/addac/Kconfig | 16 ++++++++++++++++ drivers/iio/addac/Makefile | 1 + drivers/iio/{adc => addac}/stx104.c | 0 6 files changed, 18 insertions(+), 18 deletions(-) rename drivers/iio/{adc => addac}/stx104.c (100%) base-commit: b82217e73b5aa6db8453ad91b929ca2366e47184