Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: iio: lpc32xx-adc: Remove driver conflict due to device tree

Previously, the touchscreen and ADC drivers of the LPC32xx SoC had a Kconfig
conflict declared because they use the same hardware. Upon the introduction of
device tree support in both drivers, the conflict must be removed to enable
the same kernel to support different hardware (configured via the device tree).

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Roland Stigge and committed by
Greg Kroah-Hartman
5d4a6789 db3b9e99

+5 -3
+5 -3
drivers/staging/iio/adc/Kconfig
··· 195 195 196 196 config LPC32XX_ADC 197 197 tristate "NXP LPC32XX ADC" 198 - depends on ARCH_LPC32XX && !TOUCHSCREEN_LPC32XX 198 + depends on ARCH_LPC32XX 199 199 help 200 200 Say yes here to build support for the integrated ADC inside the 201 201 LPC32XX SoC. Note that this feature uses the same hardware as the 202 - touchscreen driver, so you can only select one of the two drivers 203 - (lpc32xx_adc or lpc32xx_ts). Provides direct access via sysfs. 202 + touchscreen driver, so you should either select only one of the two 203 + drivers (lpc32xx_adc or lpc32xx_ts) or, in the OpenFirmware case, 204 + activate only one via device tree selection. Provides direct access 205 + via sysfs. 204 206 205 207 config SPEAR_ADC 206 208 tristate "ST SPEAr ADC"