All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philippe Schenker <dev@pschenker.ch>
To: jic23@kernel.org, marcel.ziswiler@toradex.com, stefan@agner.ch
Cc: thierry.reding@gmail.com, Philippe Schenker <dev@pschenker.ch>,
	Philippe Schenker <philippe.schenker@toradex.com>,
	devicetree@vger.kernel.org,
	Jonathan Hunter <jonathanh@nvidia.com>,
	linux-kernel@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
	linux-tegra@vger.kernel.org, Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH v4 8/8] ARM: dts: Add stmpe-adc DT node to Toradex T30 modules
Date: Wed, 12 Dec 2018 14:06:49 +0100	[thread overview]
Message-ID: <20181212130649.15146-8-dev@pschenker.ch> (raw)
In-Reply-To: <20181212130649.15146-1-dev@pschenker.ch>

Add the stmpe-adc DT node as found on Toradex T30 modules

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---

Changes in v4:
 - New separate commit to hold T30 devicetree changes

Changes in v3: None
Changes in v2: None

 arch/arm/boot/dts/tegra30-apalis.dtsi  | 22 ++++++++++++++--------
 arch/arm/boot/dts/tegra30-colibri.dtsi | 22 ++++++++++++++--------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index 7f112f192fe9..850b0d13549a 100644
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -976,11 +976,18 @@
 			id = <0>;
 			blocks = <0x5>;
 			irq-trigger = <0x1>;
+			/* 3.25 MHz ADC clock speed */
+			st,adc-freq = <1>;
+			/* 12-bit ADC */
+			st,mod-12b = <1>;
+			/* internal ADC reference */
+			st,ref-sel = <0>;
+			/* ADC converstion time: 80 clocks */
+			st,sample-time = <4>;
+			/* forbid to use ADC channels 3-0 (touch) */
 
 			stmpe_touchscreen {
 				compatible = "st,stmpe-ts";
-				/* 3.25 MHz ADC clock speed */
-				st,adc-freq = <1>;
 				/* 8 sample average control */
 				st,ave-ctrl = <3>;
 				/* 7 length fractional part in z */
@@ -990,17 +997,16 @@
 				 * current limit value
 				 */
 				st,i-drive = <1>;
-				/* 12-bit ADC */
-				st,mod-12b = <1>;
-				/* internal ADC reference */
-				st,ref-sel = <0>;
-				/* ADC converstion time: 80 clocks */
-				st,sample-time = <4>;
 				/* 1 ms panel driver settling time */
 				st,settling = <3>;
 				/* 5 ms touch detect interrupt delay */
 				st,touch-det-delay = <5>;
 			};
+
+			stmpe_adc {
+				compatible = "st,stmpe-adc";
+				st,norequest-mask = <0x0F>;
+			};
 		};
 
 		/*
diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index 35af03ca9e90..1f9198bb24ff 100644
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -845,11 +845,18 @@
 			id = <0>;
 			blocks = <0x5>;
 			irq-trigger = <0x1>;
+			/* 3.25 MHz ADC clock speed */
+			st,adc-freq = <1>;
+			/* 12-bit ADC */
+			st,mod-12b = <1>;
+			/* internal ADC reference */
+			st,ref-sel = <0>;
+			/* ADC converstion time: 80 clocks */
+			st,sample-time = <4>;
+			/* forbid to use ADC channels 3-0 (touch) */
 
 			stmpe_touchscreen {
 				compatible = "st,stmpe-ts";
-				/* 3.25 MHz ADC clock speed */
-				st,adc-freq = <1>;
 				/* 8 sample average control */
 				st,ave-ctrl = <3>;
 				/* 7 length fractional part in z */
@@ -859,17 +866,16 @@
 				 * current limit value
 				 */
 				st,i-drive = <1>;
-				/* 12-bit ADC */
-				st,mod-12b = <1>;
-				/* internal ADC reference */
-				st,ref-sel = <0>;
-				/* ADC converstion time: 80 clocks */
-				st,sample-time = <4>;
 				/* 1 ms panel driver settling time */
 				st,settling = <3>;
 				/* 5 ms touch detect interrupt delay */
 				st,touch-det-delay = <5>;
 			};
+
+			stmpe_adc {
+				compatible = "st,stmpe-adc";
+				st,norequest-mask = <0x0F>;
+			};
 		};
 
 		/*
-- 
2.19.2

  parent reply	other threads:[~2018-12-12 13:06 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-12 13:06 [PATCH v4 1/8] dt-bindings: stmpe: reformatting parameter list and use tabs only Philippe Schenker
2018-12-12 13:06 ` Philippe Schenker
2018-12-12 13:06 ` Philippe Schenker
2018-12-12 13:06 ` [PATCH v4 2/8] mfd: stmpe: Move ADC related defines to header of mfd Philippe Schenker
2018-12-12 13:06   ` Philippe Schenker
2018-12-12 13:06 ` [PATCH v4 3/8] mfd: stmpe: preparations for STMPE ADC driver Philippe Schenker
2018-12-12 13:06   ` Philippe Schenker
2018-12-21 10:42   ` Lee Jones
2018-12-21 10:42     ` Lee Jones
2018-12-12 13:06 ` [PATCH v4 4/8] Input: stmpe-ts: " Philippe Schenker
2018-12-12 13:06   ` Philippe Schenker
2018-12-12 13:06 ` [PATCH v4 5/8] iio: adc: add STMPE ADC driver using IIO framework Philippe Schenker
2018-12-12 13:06   ` Philippe Schenker
2018-12-16 12:24   ` Jonathan Cameron
2018-12-16 12:24     ` Jonathan Cameron
2018-12-12 13:06 ` [PATCH v4 6/8] iio: adc: add STMPE ADC devicetree bindings Philippe Schenker
2018-12-12 13:06   ` Philippe Schenker
2018-12-16 12:28   ` Jonathan Cameron
2018-12-16 12:28     ` Jonathan Cameron
2018-12-17 22:15   ` Rob Herring
2018-12-17 22:15     ` Rob Herring
2018-12-12 13:06 ` [PATCH v4 7/8] ARM: dts: Add stmpe-adc DT node to Toradex iMX6 modules Philippe Schenker
2018-12-12 13:06   ` Philippe Schenker
2018-12-12 13:06 ` Philippe Schenker [this message]
2018-12-20 12:34   ` [PATCH v4 8/8] ARM: dts: Add stmpe-adc DT node to Toradex T30 modules Dmitry Osipenko
2018-12-17 22:06 ` [PATCH v4 1/8] dt-bindings: stmpe: reformatting parameter list and use tabs only Rob Herring
2018-12-17 22:06   ` Rob Herring
2018-12-21 10:42 ` Lee Jones
2018-12-21 10:42   ` Lee Jones
2018-12-21 10:44 ` Lee Jones
2018-12-21 10:44   ` Lee Jones

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=20181212130649.15146-8-dev@pschenker.ch \
    --to=dev@pschenker.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=jic23@kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=marcel.ziswiler@toradex.com \
    --cc=mark.rutland@arm.com \
    --cc=philippe.schenker@toradex.com \
    --cc=robh+dt@kernel.org \
    --cc=stefan@agner.ch \
    --cc=thierry.reding@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.