From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcel Ziswiler Subject: Re: [PATCH v5 7/8] ARM: dts: Add stmpe-adc DT node to Toradex iMX6 modules Date: Wed, 9 Jan 2019 11:47:58 +0000 Message-ID: <80de6dff82363982d1e6ab6d99e9304986466d7d.camel@toradex.com> References: <20181221134638.20600-1-dev@pschenker.ch> <20181221134638.20600-8-dev@pschenker.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20181221134638.20600-8-dev@pschenker.ch> Content-Language: en-US Content-ID: <2E166BF52D44B44EAA4D7FA738A39986@eurprd05.prod.outlook.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: "stefan@agner.ch" , "dev@pschenker.ch" , "jic23@kernel.org" Cc: "mark.rutland@arm.com" , "devicetree@vger.kernel.org" , "alexandre.torgue@st.com" , "robh@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "dmitry.torokhov@gmail.com" , "linux-kernel@vger.kernel.org" , Philippe Schenker , "robh+dt@kernel.org" , "thierry.reding@gmail.com" , "linux-imx@nxp.com" , "kernel@pengutronix.de" , "fabio.estevam@nxp.com" , "digetx@gmail.com" , "lee.jones@linaro.org" , "coquelin.stm32@gmail.com" , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org On Fri, 2018-12-21 at 14:46 +0100, Philippe Schenker wrote: > From: Philippe Schenker > > Add the stmpe-adc DT node as found on Toradex iMX6 modules > > Signed-off-by: Philippe Schenker Acked-by: Marcel Ziswiler > --- > > Changes in v5: None > Changes in v4: > - Moved T30 devicetree settings to separate commit > > Changes in v3: > - None > > Changes in v2: > - Put common ADC settings in mfd > > arch/arm/boot/dts/imx6qdl-apalis.dtsi | 22 ++++++++++++++-------- > arch/arm/boot/dts/imx6qdl-colibri.dtsi | 23 +++++++++++++++-------- > 2 files changed, 29 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi > b/arch/arm/boot/dts/imx6qdl-apalis.dtsi > index 3dc99dd8dde1..8db476d8978d 100644 > --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi > @@ -331,11 +331,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 */ > @@ -345,17 +352,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/imx6qdl-colibri.dtsi > b/arch/arm/boot/dts/imx6qdl-colibri.dtsi > index 87e15e7cb32b..2e303d79c7f8 100644 > --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi > @@ -262,11 +262,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 */ > @@ -276,17 +283,17 @@ > * 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"; > + /* 3.25 MHz ADC clock speed */ > + st,norequest-mask = <0x0F>; > + }; > }; > };