linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v9 2/3] mfd: Kconfig: MFD_SUN4I_GPADC depends on !TOUCHSCREN_SUN4I_GPADC
Date: Wed, 4 Jan 2017 10:58:33 +0000	[thread overview]
Message-ID: <20170104105833.GY27589@dell> (raw)
In-Reply-To: <20161213143332.24988-3-quentin.schulz@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

  parent reply	other threads:[~2017-01-04 10:58 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-13 14:33 [PATCH v9 0/3] add support for Allwinner SoCs ADC Quentin Schulz
2016-12-13 14:33 ` [PATCH v9 1/3] ARM: sunxi_defconfig: Add CONFIG_THERMAL_OF Quentin Schulz
2016-12-13 15:43   ` Maxime Ripard
2016-12-13 14:33 ` [PATCH v9 2/3] mfd: Kconfig: MFD_SUN4I_GPADC depends on !TOUCHSCREN_SUN4I_GPADC Quentin Schulz
2016-12-13 15:41   ` Maxime Ripard
2017-01-04 10:58   ` Lee Jones [this message]
2016-12-13 14:33 ` [PATCH v9 3/3] iio: adc: add support for Allwinner SoCs ADC Quentin Schulz
2016-12-13 15:42   ` Maxime Ripard
2016-12-30 14:40   ` Jonathan Cameron
2017-01-08 11:17     ` Jonathan Cameron
2017-01-09  2:12       ` Zhang Rui
2017-01-14 19:19       ` Quentin Schulz
2017-01-14 19:28         ` Jonathan Cameron
2017-02-06  7:37           ` Quentin Schulz
2017-02-06 18:35             ` Jonathan Cameron
2017-03-06 12:16               ` Quentin Schulz
2017-03-06 22:43                 ` Jonathan Cameron
2017-01-15 12:23   ` Lars-Peter Clausen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170104105833.GY27589@dell \
    --to=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).