Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70d135e7 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Greg Kroah-Hartman
Browse files

iio: stx104: Move to addac subdirectory 



[ Upstream commit 955c2aa9cff2dd07ff798ca8c883398731687972 ]

The stx104 driver supports both ADC and DAC functionality.

Signed-off-by: default avatarWilliam Breathitt Gray <william.gray@linaro.org>
Link: https://lore.kernel.org/r/20220815222921.138945-1-william.gray@linaro.org


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Stable-dep-of: 4f9b80aefb9e ("iio: addac: stx104: Fix race condition when converting analog-to-digital")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8ba99f7f

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,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>

































drivers/iio/adc/Kconfig



+0
−16




























Original line number
Diff line number
Diff line








@@ -840,22 +840,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

































drivers/iio/adc/Makefile



+0
−1




























Original line number
Diff line number
Diff line








@@ -72,7 +72,6 @@ obj-$(CONFIG_RCAR_GYRO_ADC) += rcar-gyroadc.o













obj-$(CONFIG_ROCKCHIP_SARADC) += rockchip_saradc.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

































drivers/iio/addac/Kconfig



+16
−0




























Original line number
Diff line number
Diff line








@@ -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
























drivers/iio/addac/Makefile



+1
−0




























Original line number
Diff line number
Diff line








@@ -4,3 +4,4 @@













#































# When adding new entries keep the list in alphabetical order













obj-$(CONFIG_STX104) += stx104.o