From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7DAAC43441 for ; Sun, 25 Nov 2018 10:04:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 550C020868 for ; Sun, 25 Nov 2018 10:04:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="fEKN2Z6h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 550C020868 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727437AbeKYUzE (ORCPT ); Sun, 25 Nov 2018 15:55:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:60926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726526AbeKYUzE (ORCPT ); Sun, 25 Nov 2018 15:55:04 -0500 Received: from archlinux (cpc91196-cmbg18-2-0-cust659.5-4.cable.virginm.net [81.96.234.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9821620850; Sun, 25 Nov 2018 10:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543140259; bh=FzqeCU8RG3QsCEaAvkdo5dyPnRLLRES6VXNMxhjyDSc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fEKN2Z6hy27U4vz8oP0JgjkaWvgb4uKmwTNd/mmjkIOruGuAXlM561KWvMCSTeox2 Ko1NQRPQSNuXQwKhjRJQaqTSxIxf0GTZhp81cUcQIXId+L9sR227IArsHuM/Hv7jRP n1n13xXEGyncqV0bZcLMfeDIYZOm01lYcfGjncTk= Date: Sun, 25 Nov 2018 10:04:13 +0000 From: Jonathan Cameron To: Philippe Schenker Cc: marcel.ziswiler@toradex.com, stefan@agner.ch, Max Krummenacher , Philippe Schenker , devicetree@vger.kernel.org, linux-iio@vger.kernel.org, Hartmut Knaack , Alexandre Torgue , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Dmitry Torokhov , Lee Jones , Maxime Coquelin , Mark Rutland , Peter Meerwald-Stadler , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Lars-Peter Clausen Subject: Re: [PATCH v3 3/4] iio: adc: add STMPE ADC devicetree bindings Message-ID: <20181125100413.73bc729f@archlinux> In-Reply-To: <20181123142411.8921-3-dev@pschenker.ch> References: <20181123142411.8921-1-dev@pschenker.ch> <20181123142411.8921-3-dev@pschenker.ch> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 23 Nov 2018 15:24:10 +0100 Philippe Schenker wrote: > From: Stefan Agner > > This adds the devicetree bindings for the STMPE ADC. > > Signed-off-by: Stefan Agner > Signed-off-by: Max Krummenacher > Signed-off-by: Philippe Schenker Clearly this will need review from input and mfd. I've suggested inline that you split the realignment out to a separate patch for reviewability reasons. > --- > > Changes in v3: > - Reformatted documentation for touchscreen to use tabs and have a better > overview of the settings. > - Added note which adc-settings will take precedence. > - changed typo in sample-time setting from 144 clocks to 124 clocks, as stated > in the datasheet. > > Changes in v2: > - Moved the bindings for ADC to the overlying mfd. > - Reformatted for better readability > > .../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 +++++++ > .../bindings/input/touchscreen/stmpe.txt | 60 ++++++++++++------- > .../devicetree/bindings/mfd/stmpe.txt | 28 ++++++--- > 3 files changed, 80 insertions(+), 29 deletions(-) > create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt > > diff --git a/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt b/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt > new file mode 100644 > index 000000000000..480e66422625 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt > @@ -0,0 +1,21 @@ > +STMPE ADC driver > +---------------- > + > +Required properties: > + - compatible: "st,stmpe-adc" > + > +Optional properties: > +Note that the ADC is shared with the STMPE touchscreen. ADC related settings > +have to be done in the mfd. > +- st,norequest-mask: bitmask specifying which ADC channels should _not_ be > + requestable due to different usage (e.g. touch) > + > +Node name must be stmpe_adc and should be child node of stmpe node to > +which it belongs. > + > +Example: > + > + stmpe_adc { Can we use adc { here to match standard naming? > + compatible = "st,stmpe-adc"; > + st,norequest-mask = <0x0F>; /* dont use ADC CH3-0 */ > + }; > diff --git a/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt b/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt > index 127baa31a77a..414586513a02 100644 > --- a/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt > +++ b/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt > @@ -5,36 +5,52 @@ Required properties: > - compatible: "st,stmpe-ts" > > Optional properties: > -- st,sample-time: ADC converstion time in number of clock. (0 -> 36 clocks, 1 -> > - 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks, 4 -> 80 clocks, 5 -> 96 clocks, 6 > - -> 144 clocks), recommended is 4. > -- st,mod-12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC) > -- st,ref-sel: ADC reference source (0 -> internal reference, 1 -> external > - reference) > -- st,adc-freq: ADC Clock speed (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz) > -- st,ave-ctrl: Sample average control (0 -> 1 sample, 1 -> 2 samples, 2 -> 4 > - samples, 3 -> 8 samples) > -- st,touch-det-delay: Touch detect interrupt delay (0 -> 10 us, 1 -> 50 us, 2 -> > - 100 us, 3 -> 500 us, 4-> 1 ms, 5 -> 5 ms, 6 -> 10 ms, 7 -> 50 ms) recommended > - is 3 > -- st,settling: Panel driver settling time (0 -> 10 us, 1 -> 100 us, 2 -> 500 us, 3 > - -> 1 ms, 4 -> 5 ms, 5 -> 10 ms, 6 for 50 ms, 7 -> 100 ms) recommended is 2 > -- st,fraction-z: Length of the fractional part in z (fraction-z ([0..7]) = Count of > - the fractional part) recommended is 7 > -- st,i-drive: current limit value of the touchscreen drivers (0 -> 20 mA typical 35 > - mA max, 1 -> 50 mA typical 80 mA max) > +- st,ave-ctrl : Sample average control > + 0 -> 1 sample > + 1 -> 2 samples > + 2 -> 4 samples > + 3 -> 8 samples > +- st,touch-det-delay : Touch detect interrupt delay (recommended is 3) > + 0 -> 10 us 5 -> 5 ms > + 1 -> 50 us 6 -> 10 ms > + 2 -> 100 us 7 -> 50 ms > + 3 -> 500 us > + 4-> 1 ms > +- st,settling : Panel driver settling time (recommended is 2) > + 0 -> 10 us 5 -> 10 ms > + 1 -> 100 us 6 for 50 ms > + 2 -> 500 us 7 -> 100 ms > + 3 -> 1 ms > + 4 -> 5 ms > +- st,fraction-z : Length of the fractional part in z (recommended is 7) > + (fraction-z ([0..7]) = Count of the fractional part) > +- st,i-drive : current limit value of the touchscreen drivers > + 0 -> 20 mA (typical 35mA max) > + 1 -> 50 mA (typical 80 mA max) > + > +Optional properties common with MFD (deprecated): > + - st,sample-time : ADC conversion time in number of clock. > + 0 -> 36 clocks 4 -> 80 clocks (recommended) > + 1 -> 44 clocks 5 -> 96 clocks > + 2 -> 56 clocks 6 -> 124 clocks > + 3 -> 64 clocks > + - st,mod-12b : ADC Bit mode > + 0 -> 10bit ADC 1 -> 12bit ADC > + - st,ref-sel : ADC reference source > + 0 -> internal 1 -> external > + - st,adc-freq : ADC Clock speed > + 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz > + 1 -> 3.25 MHz > > Node name must be stmpe_touchscreen and should be child node of stmpe node to > which it belongs. > > +Note that common ADC settings of stmpe_touchscreen will take precedence. > + > Example: > > stmpe_touchscreen { > compatible = "st,stmpe-ts"; > - st,sample-time = <4>; > - st,mod-12b = <1>; > - st,ref-sel = <0>; > - st,adc-freq = <1>; > st,ave-ctrl = <1>; > st,touch-det-delay = <2>; > st,settling = <2>; > diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt > index c797c05cd3c2..d4408a417193 100644 > --- a/Documentation/devicetree/bindings/mfd/stmpe.txt > +++ b/Documentation/devicetree/bindings/mfd/stmpe.txt > @@ -4,15 +4,29 @@ STMPE is an MFD device which may expose the following inbuilt devices: gpio, > keypad, touchscreen, adc, pwm, rotator. > > Required properties: > - - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]" > - - reg : I2C/SPI address of the device > + - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]" > + - reg : I2C/SPI address of the device Nothing wrong with correcting alignment, but it shouldn't be in the same patch as a fundamental change lie this. Just adds noise. If that means you first have to introduce the new block missaligned, then fix up the alignment in a follow up patch, then do that as we can then effectively ignore the realignment as obviously correct and focus on the real changes. > > Optional properties: > - - interrupts : The interrupt outputs from the controller > - - interrupt-controller : Marks the device node as an interrupt controller > - - wakeup-source : Marks the input device as wakable > - - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 > - - irq-gpio : If present, which GPIO to use for event IRQ > + - interrupts : The interrupt outputs from the controller > + - interrupt-controller : Marks the device node as an interrupt controller > + - wakeup-source : Marks the input device as wakable > + - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 > + - irq-gpio : If present, which GPIO to use for event IRQ > + > +Optional properties for devices with touch and ADC (STMPE811|STMPE610): > + - st,sample-time : ADC conversion time in number of clock. > + 0 -> 36 clocks 4 -> 80 clocks (recommended) > + 1 -> 44 clocks 5 -> 96 clocks > + 2 -> 56 clocks 6 -> 124 clocks > + 3 -> 64 clocks > + - st,mod-12b : ADC Bit mode > + 0 -> 10bit ADC 1 -> 12bit ADC > + - st,ref-sel : ADC reference source > + 0 -> internal 1 -> external > + - st,adc-freq : ADC Clock speed > + 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz > + 1 -> 3.25 MHz > > Example: > From mboxrd@z Thu Jan 1 00:00:00 1970 From: jic23@kernel.org (Jonathan Cameron) Date: Sun, 25 Nov 2018 10:04:13 +0000 Subject: [PATCH v3 3/4] iio: adc: add STMPE ADC devicetree bindings In-Reply-To: <20181123142411.8921-3-dev@pschenker.ch> References: <20181123142411.8921-1-dev@pschenker.ch> <20181123142411.8921-3-dev@pschenker.ch> Message-ID: <20181125100413.73bc729f@archlinux> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 23 Nov 2018 15:24:10 +0100 Philippe Schenker wrote: > From: Stefan Agner > > This adds the devicetree bindings for the STMPE ADC. > > Signed-off-by: Stefan Agner > Signed-off-by: Max Krummenacher > Signed-off-by: Philippe Schenker Clearly this will need review from input and mfd. I've suggested inline that you split the realignment out to a separate patch for reviewability reasons. > --- > > Changes in v3: > - Reformatted documentation for touchscreen to use tabs and have a better > overview of the settings. > - Added note which adc-settings will take precedence. > - changed typo in sample-time setting from 144 clocks to 124 clocks, as stated > in the datasheet. > > Changes in v2: > - Moved the bindings for ADC to the overlying mfd. > - Reformatted for better readability > > .../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 +++++++ > .../bindings/input/touchscreen/stmpe.txt | 60 ++++++++++++------- > .../devicetree/bindings/mfd/stmpe.txt | 28 ++++++--- > 3 files changed, 80 insertions(+), 29 deletions(-) > create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt > > diff --git a/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt b/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt > new file mode 100644 > index 000000000000..480e66422625 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt > @@ -0,0 +1,21 @@ > +STMPE ADC driver > +---------------- > + > +Required properties: > + - compatible: "st,stmpe-adc" > + > +Optional properties: > +Note that the ADC is shared with the STMPE touchscreen. ADC related settings > +have to be done in the mfd. > +- st,norequest-mask: bitmask specifying which ADC channels should _not_ be > + requestable due to different usage (e.g. touch) > + > +Node name must be stmpe_adc and should be child node of stmpe node to > +which it belongs. > + > +Example: > + > + stmpe_adc { Can we use adc { here to match standard naming? > + compatible = "st,stmpe-adc"; > + st,norequest-mask = <0x0F>; /* dont use ADC CH3-0 */ > + }; > diff --git a/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt b/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt > index 127baa31a77a..414586513a02 100644 > --- a/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt > +++ b/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt > @@ -5,36 +5,52 @@ Required properties: > - compatible: "st,stmpe-ts" > > Optional properties: > -- st,sample-time: ADC converstion time in number of clock. (0 -> 36 clocks, 1 -> > - 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks, 4 -> 80 clocks, 5 -> 96 clocks, 6 > - -> 144 clocks), recommended is 4. > -- st,mod-12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC) > -- st,ref-sel: ADC reference source (0 -> internal reference, 1 -> external > - reference) > -- st,adc-freq: ADC Clock speed (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz) > -- st,ave-ctrl: Sample average control (0 -> 1 sample, 1 -> 2 samples, 2 -> 4 > - samples, 3 -> 8 samples) > -- st,touch-det-delay: Touch detect interrupt delay (0 -> 10 us, 1 -> 50 us, 2 -> > - 100 us, 3 -> 500 us, 4-> 1 ms, 5 -> 5 ms, 6 -> 10 ms, 7 -> 50 ms) recommended > - is 3 > -- st,settling: Panel driver settling time (0 -> 10 us, 1 -> 100 us, 2 -> 500 us, 3 > - -> 1 ms, 4 -> 5 ms, 5 -> 10 ms, 6 for 50 ms, 7 -> 100 ms) recommended is 2 > -- st,fraction-z: Length of the fractional part in z (fraction-z ([0..7]) = Count of > - the fractional part) recommended is 7 > -- st,i-drive: current limit value of the touchscreen drivers (0 -> 20 mA typical 35 > - mA max, 1 -> 50 mA typical 80 mA max) > +- st,ave-ctrl : Sample average control > + 0 -> 1 sample > + 1 -> 2 samples > + 2 -> 4 samples > + 3 -> 8 samples > +- st,touch-det-delay : Touch detect interrupt delay (recommended is 3) > + 0 -> 10 us 5 -> 5 ms > + 1 -> 50 us 6 -> 10 ms > + 2 -> 100 us 7 -> 50 ms > + 3 -> 500 us > + 4-> 1 ms > +- st,settling : Panel driver settling time (recommended is 2) > + 0 -> 10 us 5 -> 10 ms > + 1 -> 100 us 6 for 50 ms > + 2 -> 500 us 7 -> 100 ms > + 3 -> 1 ms > + 4 -> 5 ms > +- st,fraction-z : Length of the fractional part in z (recommended is 7) > + (fraction-z ([0..7]) = Count of the fractional part) > +- st,i-drive : current limit value of the touchscreen drivers > + 0 -> 20 mA (typical 35mA max) > + 1 -> 50 mA (typical 80 mA max) > + > +Optional properties common with MFD (deprecated): > + - st,sample-time : ADC conversion time in number of clock. > + 0 -> 36 clocks 4 -> 80 clocks (recommended) > + 1 -> 44 clocks 5 -> 96 clocks > + 2 -> 56 clocks 6 -> 124 clocks > + 3 -> 64 clocks > + - st,mod-12b : ADC Bit mode > + 0 -> 10bit ADC 1 -> 12bit ADC > + - st,ref-sel : ADC reference source > + 0 -> internal 1 -> external > + - st,adc-freq : ADC Clock speed > + 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz > + 1 -> 3.25 MHz > > Node name must be stmpe_touchscreen and should be child node of stmpe node to > which it belongs. > > +Note that common ADC settings of stmpe_touchscreen will take precedence. > + > Example: > > stmpe_touchscreen { > compatible = "st,stmpe-ts"; > - st,sample-time = <4>; > - st,mod-12b = <1>; > - st,ref-sel = <0>; > - st,adc-freq = <1>; > st,ave-ctrl = <1>; > st,touch-det-delay = <2>; > st,settling = <2>; > diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt > index c797c05cd3c2..d4408a417193 100644 > --- a/Documentation/devicetree/bindings/mfd/stmpe.txt > +++ b/Documentation/devicetree/bindings/mfd/stmpe.txt > @@ -4,15 +4,29 @@ STMPE is an MFD device which may expose the following inbuilt devices: gpio, > keypad, touchscreen, adc, pwm, rotator. > > Required properties: > - - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]" > - - reg : I2C/SPI address of the device > + - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]" > + - reg : I2C/SPI address of the device Nothing wrong with correcting alignment, but it shouldn't be in the same patch as a fundamental change lie this. Just adds noise. If that means you first have to introduce the new block missaligned, then fix up the alignment in a follow up patch, then do that as we can then effectively ignore the realignment as obviously correct and focus on the real changes. > > Optional properties: > - - interrupts : The interrupt outputs from the controller > - - interrupt-controller : Marks the device node as an interrupt controller > - - wakeup-source : Marks the input device as wakable > - - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 > - - irq-gpio : If present, which GPIO to use for event IRQ > + - interrupts : The interrupt outputs from the controller > + - interrupt-controller : Marks the device node as an interrupt controller > + - wakeup-source : Marks the input device as wakable > + - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 > + - irq-gpio : If present, which GPIO to use for event IRQ > + > +Optional properties for devices with touch and ADC (STMPE811|STMPE610): > + - st,sample-time : ADC conversion time in number of clock. > + 0 -> 36 clocks 4 -> 80 clocks (recommended) > + 1 -> 44 clocks 5 -> 96 clocks > + 2 -> 56 clocks 6 -> 124 clocks > + 3 -> 64 clocks > + - st,mod-12b : ADC Bit mode > + 0 -> 10bit ADC 1 -> 12bit ADC > + - st,ref-sel : ADC reference source > + 0 -> internal 1 -> external > + - st,adc-freq : ADC Clock speed > + 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz > + 1 -> 3.25 MHz > > Example: >