linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcel Ziswiler <marcel@ziswiler.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>,
	Fabio Estevam <festevam@gmail.com>,
	Frank Rowand <frowand.list@gmail.com>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	NXP Linux Team <linux-imx@nxp.com>,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	Rob Herring <robh+dt@kernel.org>,
	Russell King <linux@armlinux.org.uk>,
	Sascha Hauer <s.hauer@pengutronix.de>,
	Shawn Guo <shawnguo@kernel.org>,
	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	[thread overview]
Message-ID: <20220506152809.295409-16-marcel@ziswiler.com> (raw)
In-Reply-To: <20220506152809.295409-1-marcel@ziswiler.com>

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

ADC2 is not available as it conflicts with the AD7879 resistive
touchscreen.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

 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<B>, PWM<C>, 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 = <&reg_DCDC3>;
 };
 
+/* ADC2 is not available as it conflicts with AD7879 resistive touchscreen. */
 &adc2 {
-	vref-supply = <&reg_DCDC3>;
+	status = "disabled";
 };
 
 &cpu0 {
-- 
2.35.1


  parent reply	other threads:[~2022-05-06 15:30 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-06 15:27 [PATCH v1 00/24] ARM: dts: imx7-colibri: device tree improvements Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 01/24] ARM: dts: imx7-colibri: overhaul display/touch functionality Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 02/24] ARM: dts: imx7-colibri: add mdio phy node Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 03/24] ARM: dts: imx7-colibri: set lcdif clock source to video pll Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 04/24] ARM: dts: imx7-colibri: add usb dual-role switching using extcon Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 05/24] ARM: dts: imx7-colibri: improve licensing and compatible strings Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 06/24] ARM: dts: imx7-colibri: improve wake-up with gpio key Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 07/24] ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 08/24] ARM: dts: imx7-colibri: add ethernet aliases Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 09/24] ARM: dts: imx7-colibri: move regulators Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 10/24] ARM: dts: imx7-colibri: add delay for on-module phy supply Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 11/24] ARM: dts: imx7-colibri: clean-up usdhc1 and add sleep config Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 12/24] ARM: dts: imx7-colibri: move rtc node Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 13/24] ARM: dts: imx7d-colibri-emmc: add cpu1 supply Marcel Ziswiler
2022-05-06 15:27 ` [PATCH v1 14/24] ARM: dts: imx7-colibri-eval-v3: correct can controller comment Marcel Ziswiler
2022-05-06 15:28 ` Marcel Ziswiler [this message]
2022-05-06 15:28 ` [PATCH v1 16/24] ARM: dts: imx7-colibri-aster: add ssp aka spi cs aka ss pins Marcel Ziswiler
2022-05-06 15:28 ` [PATCH v1 17/24] ARM: dts: imx7-colibri: add clarifying comments Marcel Ziswiler
2022-05-06 15:28 ` [PATCH v1 18/24] ARM: dts: imx7-colibri: alphabetical re-order Marcel Ziswiler
2022-05-06 15:28 ` [PATCH v1 19/24] ARM: dts: imx7-colibri: clean-up device enabling/disabling Marcel Ziswiler
2022-05-06 15:46 ` [PATCH v1 00/24] ARM: dts: imx7-colibri: device tree improvements Marcel Ziswiler
2022-05-06 15:46 ` [PATCH v1 19/24] ARM: dts: imx7-colibri: clean-up device enabling/disabling Marcel Ziswiler
2022-05-06 15:47 ` [PATCH v1 20/24] ARM: dts: imx7-colibri: remove leading zero from reg address Marcel Ziswiler
2022-05-06 15:48 ` [PATCH v1 21/24] ARM: dts: imx7-colibri: set regulator-name properties Marcel Ziswiler
2022-05-06 15:48 ` [PATCH v1 22/24] ARM: dts: imx7-colibri: clean-up iomuxc pinctrl group naming Marcel Ziswiler
2022-05-06 15:56 ` [PATCH v1 23/24] dt-bindings: arm: fsl: add toradex,colibri-imx7s/d/d-emmc-iris/-v2 Marcel Ziswiler
2022-05-09 11:03   ` Krzysztof Kozlowski
2022-05-06 15:58 ` [PATCH v1 24/24] ARM: dts: imx7-colibri: add support for Toradex Iris carrier boards Marcel Ziswiler
2022-05-06 21:32   ` Marcel Ziswiler

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=20220506152809.295409-16-marcel@ziswiler.com \
    --to=marcel@ziswiler.com \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=frowand.list@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=krzk+dt@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=marcel.ziswiler@toradex.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.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).