From patchwork Fri May 6 15:28:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12841334 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0909FC433F5 for ; Fri, 6 May 2022 15:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xSv7PRtFzMcTQG3KIxXM3p3IQQUb9C48MXMcJ1lHJu4=; b=b3qTpNEGk93bwT Ujn2kA4dj/B1bqFwx5jseObG5HvjcyvEwbOgdYLDmOkM2Ma/lRPwohGgcarStJkokJWeNhpjIxvUs wZk8r6mxx7tqrpZbruh+YfBg3onP3bdV4wu5J0Iw08ksXzZEsyALF2BtT18dpLWhzswWJKXZNdKTq oF/DjtXrD+HEsfjBcQHKOqpJqWGQyyY6s/Qf/3HKuO1bSsQl3C9O5TFw1gafK7DibCjc7sx3R51bq P5uWk/wh38qs77d2ZYyaZ2VycG3DCiVb4j/00u3zOiWBsRD9lQDpR0xtm+H9UuRAFNLCMYz25hgq2 XEfH5oBSUc0SsxlSGtpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmzxn-00464J-BH; Fri, 06 May 2022 15:33:52 +0000 Received: from mout.perfora.net ([74.208.4.194]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmztP-0043KC-Dj for linux-arm-kernel@lists.infradead.org; Fri, 06 May 2022 15:29:20 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1Mde05-1oM3eq45Mv-00ZdTN; Fri, 06 May 2022 17:29:06 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 15/24] ARM: dts: imx7-colibri: disable adc2 Date: Fri, 6 May 2022 17:28:00 +0200 Message-Id: <20220506152809.295409-16-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220506152809.295409-1-marcel@ziswiler.com> References: <20220506152809.295409-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Gs+o33e0av+49MlbiGdcvNvTMn81YyAmf9sqr1EWHP0Ruqe9G8V n3qpKkkri+qmw+ImwaCGKqOvK7SzZ1VhM5dBvfvekAd+hwnTJiN87j3Wz2J9IqrgTbYKegf tuIwUWJOCyjXgBBdATA6vKXBH9FZtihaxRxbaK64/uo3AhA+FRqSrT/t2mtJ1HWdnkJvsAh q4cF+OOLQmTwlJTlsNs/g== X-UI-Out-Filterresults: notjunk:1;V03:K0:fYbCvDuXquo=:PAHMVa0aikw0+D748eFZ4m IF3fNqWYNs+jvmoYNs4FpC3XnXbJdect5hOaPGlxiqPY+atvX7cf4SHNMB12PfHVXAXWbhsy5 NXO3GIqDnT0m0alj5Rn4azZBuGeF0zA571SviorjHqXp30THuqYo0RDIVqukUg00a8X0z6OfZ aDYSeVuP9IM8Fm5psA87LzQAPdtSh+SisHFUXPFf7nuJYA3j7G1ef9zQL5OD/hlUyLifmV4F5 fVcjvfdsM3vKDH2YMNBwaEX1Hma4eG/cKrb6zQT2UI0kbVISaD+YFb7jouSpq0Ie4Nf+oFAfG j6f/uJCplCC5HeWfwoqmDRZUmvRxaXgoyZaF3asyPSMGWRSYIjbzo7u9xHnr7cybEYuoWXSmV LYHDAjw/QtB3VQBF1dppQ6jyY+wqEgqR3vrMFXZNlOTWv6ywRbTbn2E4Xs8jBiwsWN5aZG04r Gs53yYvtcM9Te852CeSMECvaAOHlBLMlrVbUVtPAKCZ8/VlE4aSb3cDqXqrQk0K9pWXJyefsN qSoLhgDfwjaAXZuyvFT6FxGf9AR/49K+I1TXpJFt1LE+sH3FxRmHu3ATLaoo95m9vno74QCPO Bgd+hNZA4DkMsAMNoFFRFo93tBob7NUznUJLxP99nYXvTZGw+ipmuqYzfzwpFKskIGTz+Cmjr vUgamscyOfAfLollV/+Wam0Ijol+0r7/HCov1ON5CbFH64n3kYEVDw2jkCGQAH+SpbiI= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220506_082919_578954_062A9287 X-CRM114-Status: GOOD ( 11.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Marcel Ziswiler ADC2 is not available as it conflicts with the AD7879 resistive touchscreen. Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx7-colibri-aster.dtsi | 8 -------- arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 4 ---- arch/arm/boot/dts/imx7-colibri.dtsi | 3 ++- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi index 9796bfabe241..a89c868ff3ed 100644 --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi @@ -7,14 +7,6 @@ &adc1 { status = "okay"; }; -/* - * ADC2 is not available on the Aster board and - * conflicts with AD7879 resistive touchscreen. - */ -&adc2 { - status = "disabled"; -}; - &fec1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 069f56272546..6ae38c1f38d4 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -16,10 +16,6 @@ &adc1 { status = "okay"; }; -&adc2 { - status = "okay"; -}; - /* * The Atmel maxtouch controller uses SODIMM 28/30, also used for PWM, PWM, aka pwm2, pwm3. * So if you enable following capacitive touch controller, disable pwm2/pwm3 first. diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index da3df00c7d67..0fc4b33d97be 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -137,8 +137,9 @@ &adc1 { vref-supply = <®_DCDC3>; }; +/* ADC2 is not available as it conflicts with AD7879 resistive touchscreen. */ &adc2 { - vref-supply = <®_DCDC3>; + status = "disabled"; }; &cpu0 {