| Message ID | 20161213143332.24988-3-quentin.schulz@free-electrons.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Dec 13, 2016 at 03:33:31PM +0100, Quentin Schulz wrote: > MFD_SUN4I_GPADC and TOUCHSCREEN_SUN4I are incompatible (both are drivers > for Allwinner SoCs' ADC). This makes sure TOUCHSCREEN_SUN4I isn't > enabled while MFD_SUN4I_GPADC is enabled. > > Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
On Tue, 13 Dec 2016, Quentin Schulz wrote: > MFD_SUN4I_GPADC and TOUCHSCREEN_SUN4I are incompatible (both are drivers > for Allwinner SoCs' ADC). This makes sure TOUCHSCREEN_SUN4I isn't > enabled while MFD_SUN4I_GPADC is enabled. > > Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> > --- > > added in v8. I wrongly put the XOR dependance for SUN4I_GPADC and > TOUCHSCREEN_SUN4I instead of for MFD_SUN4I_GPADC and TOUCHSCREEN_SUN4I. > > drivers/mfd/Kconfig | 1 + > 1 file changed, 1 insertion(+) Applied, thanks. > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 443ee50..e803884 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -45,6 +45,7 @@ config MFD_SUN4I_GPADC > select MFD_CORE > select REGMAP_MMIO > depends on ARCH_SUNXI || COMPILE_TEST > + depends on !TOUCHSCREEN_SUN4I > help > Select this to get support for Allwinner SoCs (A10, A13 and A31) ADC. > This driver will only map the hardware interrupt and registers, you -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 443ee50..e803884 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -45,6 +45,7 @@ config MFD_SUN4I_GPADC select MFD_CORE select REGMAP_MMIO depends on ARCH_SUNXI || COMPILE_TEST + depends on !TOUCHSCREEN_SUN4I help Select this to get support for Allwinner SoCs (A10, A13 and A31) ADC. This driver will only map the hardware interrupt and registers, you
MFD_SUN4I_GPADC and TOUCHSCREEN_SUN4I are incompatible (both are drivers for Allwinner SoCs' ADC). This makes sure TOUCHSCREEN_SUN4I isn't enabled while MFD_SUN4I_GPADC is enabled. Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> --- added in v8. I wrongly put the XOR dependance for SUN4I_GPADC and TOUCHSCREEN_SUN4I instead of for MFD_SUN4I_GPADC and TOUCHSCREEN_SUN4I. drivers/mfd/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.3