[4/4] Input: tsc2004 - Document ts2004 dt bindings
diff mbox

Message ID 20151103072124.GA33601@dtor-ws
State Accepted
Headers show

Commit Message

Dmitry Torokhov Nov. 3, 2015, 7:21 a.m. UTC
On Mon, Nov 02, 2015 at 02:50:29PM -0600, Michael Welling wrote:
> On Mon, Nov 02, 2015 at 09:19:50AM -0600, Rob Herring wrote:
> > > +Required properties:
> > > + - compatible                : "ti,tsc2004"
> > > + - interrupts                : IRQ specifier
> > > + - vio-supply                 : Regulator specifier
> > 
> > reg property?
> 
> Rob,
> 
> It appears that I missed this in the description.
> 
> Probably because I was following the lead of the ts2005 description.
> 
> How does this look:
> - reg			: I2C address. 0x48 - 0x4b based on the voltage applied to
> 			  the AD1 and AD0 inputs on the IC.
> 

How about the version below?

Thanks.

Comments

Rob Herring Nov. 3, 2015, 3:31 p.m. UTC | #1
On Tue, Nov 3, 2015 at 1:21 AM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> On Mon, Nov 02, 2015 at 02:50:29PM -0600, Michael Welling wrote:
>> On Mon, Nov 02, 2015 at 09:19:50AM -0600, Rob Herring wrote:
>> > > +Required properties:
>> > > + - compatible                : "ti,tsc2004"
>> > > + - interrupts                : IRQ specifier
>> > > + - vio-supply                 : Regulator specifier
>> >
>> > reg property?
>>
>> Rob,
>>
>> It appears that I missed this in the description.
>>
>> Probably because I was following the lead of the ts2005 description.
>>
>> How does this look:
>> - reg                 : I2C address. 0x48 - 0x4b based on the voltage applied to
>>                         the AD1 and AD0 inputs on the IC.
>>
>
> How about the version below?
>
> Thanks.
>
> --
> Dmitry
>
>
> Input: tsc2004 - document ts2004 dt bindings
>
> From: Michael Welling <mwelling@ieee.org>
>
> Adds documentation for the devicetree bindings of the new tsc2004 driver.
>
> Signed-off-by: Michael Welling <mwelling@ieee.org>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Acked-by: Rob Herring <robh@kernel.org>

> ---
>  .../bindings/input/touchscreen/tsc2005.txt         |   34 ++++++++++++++++----
>  1 file changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt b/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
> index 09089a6..b80c04b 100644
> --- a/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
> +++ b/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
> @@ -1,14 +1,15 @@
> -* Texas Instruments tsc2005 touchscreen controller
> +* Texas Instruments tsc2004 and tsc2005 touchscreen controllers
>
>  Required properties:
> - - compatible                : "ti,tsc2005"
> - - reg                       : SPI device address
> - - spi-max-frequency         : Maximal SPI speed
> + - compatible                : "ti,tsc2004" or "ti,tsc2005"
> + - reg                       : Device address
>   - interrupts                : IRQ specifier
> - - reset-gpios               : GPIO specifier
> - - vio-supply                 : Regulator specifier
> + - spi-max-frequency         : Maximum SPI clocking speed of the device
> +                               (for tsc2005)
>
>  Optional properties:
> + - vio-supply                : Regulator specifier
> + - reset-gpios               : GPIO specifier for the controller reset line
>   - ti,x-plate-ohms           : integer, resistance of the touchscreen's X plates
>                                 in ohm (defaults to 280)
>   - ti,esd-recovery-timeout-ms : integer, if the touchscreen does not respond after
> @@ -18,6 +19,27 @@ Optional properties:
>
>  Example:
>
> +&i2c3 {
> +       tsc2004@48 {
> +               compatible = "ti,tsc2004";
> +               reg = <0x48>;
> +               vio-supply = <&vio>;
> +
> +               reset-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;
> +               interrupts-extended = <&gpio1 27 IRQ_TYPE_EDGE_RISING>;
> +
> +               touchscreen-fuzz-x = <4>;
> +               touchscreen-fuzz-y = <7>;
> +               touchscreen-fuzz-pressure = <2>;
> +               touchscreen-size-x = <4096>;
> +               touchscreen-size-y = <4096>;
> +               touchscreen-max-pressure = <2048>;
> +
> +               ti,x-plate-ohms = <280>;
> +               ti,esd-recovery-timeout-ms = <8000>;
> +       };
> +}
> +
>  &mcspi1 {
>         tsc2005@0 {
>                 compatible = "ti,tsc2005";
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Michael Welling Nov. 3, 2015, 3:41 p.m. UTC | #2
On Tue, Nov 03, 2015 at 09:31:10AM -0600, Rob Herring wrote:
> On Tue, Nov 3, 2015 at 1:21 AM, Dmitry Torokhov
> <dmitry.torokhov@gmail.com> wrote:
> > On Mon, Nov 02, 2015 at 02:50:29PM -0600, Michael Welling wrote:
> >> On Mon, Nov 02, 2015 at 09:19:50AM -0600, Rob Herring wrote:
> >> > > +Required properties:
> >> > > + - compatible                : "ti,tsc2004"
> >> > > + - interrupts                : IRQ specifier
> >> > > + - vio-supply                 : Regulator specifier
> >> >
> >> > reg property?
> >>
> >> Rob,
> >>
> >> It appears that I missed this in the description.
> >>
> >> Probably because I was following the lead of the ts2005 description.
> >>
> >> How does this look:
> >> - reg                 : I2C address. 0x48 - 0x4b based on the voltage applied to
> >>                         the AD1 and AD0 inputs on the IC.
> >>
> >
> > How about the version below?
> >
> > Thanks.
> >
> > --
> > Dmitry
> >
> >
> > Input: tsc2004 - document ts2004 dt bindings

Just noticed that it says ts2004 instead of tsc2004 in the subject.
Otherwise, I am fine with it.

Thanks for the assistance.

Still no acks or reviews for the other patches in the series.
I would like for someone to test the tsc2005 support to see if it still works.

The tsc2004 works very well on the target that I have here.

> >
> > From: Michael Welling <mwelling@ieee.org>
> >
> > Adds documentation for the devicetree bindings of the new tsc2004 driver.
> >
> > Signed-off-by: Michael Welling <mwelling@ieee.org>
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> 
> Acked-by: Rob Herring <robh@kernel.org>
> 
> > ---
> >  .../bindings/input/touchscreen/tsc2005.txt         |   34 ++++++++++++++++----
> >  1 file changed, 28 insertions(+), 6 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt b/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
> > index 09089a6..b80c04b 100644
> > --- a/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
> > +++ b/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
> > @@ -1,14 +1,15 @@
> > -* Texas Instruments tsc2005 touchscreen controller
> > +* Texas Instruments tsc2004 and tsc2005 touchscreen controllers
> >
> >  Required properties:
> > - - compatible                : "ti,tsc2005"
> > - - reg                       : SPI device address
> > - - spi-max-frequency         : Maximal SPI speed
> > + - compatible                : "ti,tsc2004" or "ti,tsc2005"
> > + - reg                       : Device address
> >   - interrupts                : IRQ specifier
> > - - reset-gpios               : GPIO specifier
> > - - vio-supply                 : Regulator specifier
> > + - spi-max-frequency         : Maximum SPI clocking speed of the device
> > +                               (for tsc2005)
> >
> >  Optional properties:
> > + - vio-supply                : Regulator specifier
> > + - reset-gpios               : GPIO specifier for the controller reset line
> >   - ti,x-plate-ohms           : integer, resistance of the touchscreen's X plates
> >                                 in ohm (defaults to 280)
> >   - ti,esd-recovery-timeout-ms : integer, if the touchscreen does not respond after
> > @@ -18,6 +19,27 @@ Optional properties:
> >
> >  Example:
> >
> > +&i2c3 {
> > +       tsc2004@48 {
> > +               compatible = "ti,tsc2004";
> > +               reg = <0x48>;
> > +               vio-supply = <&vio>;
> > +
> > +               reset-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;
> > +               interrupts-extended = <&gpio1 27 IRQ_TYPE_EDGE_RISING>;
> > +
> > +               touchscreen-fuzz-x = <4>;
> > +               touchscreen-fuzz-y = <7>;
> > +               touchscreen-fuzz-pressure = <2>;
> > +               touchscreen-size-x = <4096>;
> > +               touchscreen-size-y = <4096>;
> > +               touchscreen-max-pressure = <2048>;
> > +
> > +               ti,x-plate-ohms = <280>;
> > +               ti,esd-recovery-timeout-ms = <8000>;
> > +       };
> > +}
> > +
> >  &mcspi1 {
> >         tsc2005@0 {
> >                 compatible = "ti,tsc2005";
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov Nov. 3, 2015, 10:59 p.m. UTC | #3
On Tue, Nov 03, 2015 at 09:41:17AM -0600, Michael Welling wrote:
> On Tue, Nov 03, 2015 at 09:31:10AM -0600, Rob Herring wrote:
> > On Tue, Nov 3, 2015 at 1:21 AM, Dmitry Torokhov
> > <dmitry.torokhov@gmail.com> wrote:
> > > On Mon, Nov 02, 2015 at 02:50:29PM -0600, Michael Welling wrote:
> > >> On Mon, Nov 02, 2015 at 09:19:50AM -0600, Rob Herring wrote:
> > >> > > +Required properties:
> > >> > > + - compatible                : "ti,tsc2004"
> > >> > > + - interrupts                : IRQ specifier
> > >> > > + - vio-supply                 : Regulator specifier
> > >> >
> > >> > reg property?
> > >>
> > >> Rob,
> > >>
> > >> It appears that I missed this in the description.
> > >>
> > >> Probably because I was following the lead of the ts2005 description.
> > >>
> > >> How does this look:
> > >> - reg                 : I2C address. 0x48 - 0x4b based on the voltage applied to
> > >>                         the AD1 and AD0 inputs on the IC.
> > >>
> > >
> > > How about the version below?
> > >
> > > Thanks.
> > >
> > > --
> > > Dmitry
> > >
> > >
> > > Input: tsc2004 - document ts2004 dt bindings
> 
> Just noticed that it says ts2004 instead of tsc2004 in the subject.
> Otherwise, I am fine with it.
> 
> Thanks for the assistance.
> 
> Still no acks or reviews for the other patches in the series.
> I would like for someone to test the tsc2005 support to see if it still works.
> 
> The tsc2004 works very well on the target that I have here.

I folded this patch into the patch #3 and applied everything.

Thanks!
Michael Welling Nov. 3, 2015, 11:11 p.m. UTC | #4
On Tue, Nov 03, 2015 at 02:59:13PM -0800, Dmitry Torokhov wrote:
> On Tue, Nov 03, 2015 at 09:41:17AM -0600, Michael Welling wrote:
> > On Tue, Nov 03, 2015 at 09:31:10AM -0600, Rob Herring wrote:
> > > On Tue, Nov 3, 2015 at 1:21 AM, Dmitry Torokhov
> > > <dmitry.torokhov@gmail.com> wrote:
> > > > On Mon, Nov 02, 2015 at 02:50:29PM -0600, Michael Welling wrote:
> > > >> On Mon, Nov 02, 2015 at 09:19:50AM -0600, Rob Herring wrote:
> > > >> > > +Required properties:
> > > >> > > + - compatible                : "ti,tsc2004"
> > > >> > > + - interrupts                : IRQ specifier
> > > >> > > + - vio-supply                 : Regulator specifier
> > > >> >
> > > >> > reg property?
> > > >>
> > > >> Rob,
> > > >>
> > > >> It appears that I missed this in the description.
> > > >>
> > > >> Probably because I was following the lead of the ts2005 description.
> > > >>
> > > >> How does this look:
> > > >> - reg                 : I2C address. 0x48 - 0x4b based on the voltage applied to
> > > >>                         the AD1 and AD0 inputs on the IC.
> > > >>
> > > >
> > > > How about the version below?
> > > >
> > > > Thanks.
> > > >
> > > > --
> > > > Dmitry
> > > >
> > > >
> > > > Input: tsc2004 - document ts2004 dt bindings
> > 
> > Just noticed that it says ts2004 instead of tsc2004 in the subject.
> > Otherwise, I am fine with it.
> > 
> > Thanks for the assistance.
> > 
> > Still no acks or reviews for the other patches in the series.
> > I would like for someone to test the tsc2005 support to see if it still works.
> > 
> > The tsc2004 works very well on the target that I have here.
> 
> I folded this patch into the patch #3 and applied everything.
>

Great.

Will this patch series conflict with the patch series to take out the .owner=THIS_MODULE
from spi_drivers?

https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1004626.html
 
> Thanks!
> 
> -- 
> Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov Nov. 3, 2015, 11:30 p.m. UTC | #5
On Tue, Nov 03, 2015 at 05:11:56PM -0600, Michael Welling wrote:
> On Tue, Nov 03, 2015 at 02:59:13PM -0800, Dmitry Torokhov wrote:
> > On Tue, Nov 03, 2015 at 09:41:17AM -0600, Michael Welling wrote:
> > > On Tue, Nov 03, 2015 at 09:31:10AM -0600, Rob Herring wrote:
> > > > On Tue, Nov 3, 2015 at 1:21 AM, Dmitry Torokhov
> > > > <dmitry.torokhov@gmail.com> wrote:
> > > > > On Mon, Nov 02, 2015 at 02:50:29PM -0600, Michael Welling wrote:
> > > > >> On Mon, Nov 02, 2015 at 09:19:50AM -0600, Rob Herring wrote:
> > > > >> > > +Required properties:
> > > > >> > > + - compatible                : "ti,tsc2004"
> > > > >> > > + - interrupts                : IRQ specifier
> > > > >> > > + - vio-supply                 : Regulator specifier
> > > > >> >
> > > > >> > reg property?
> > > > >>
> > > > >> Rob,
> > > > >>
> > > > >> It appears that I missed this in the description.
> > > > >>
> > > > >> Probably because I was following the lead of the ts2005 description.
> > > > >>
> > > > >> How does this look:
> > > > >> - reg                 : I2C address. 0x48 - 0x4b based on the voltage applied to
> > > > >>                         the AD1 and AD0 inputs on the IC.
> > > > >>
> > > > >
> > > > > How about the version below?
> > > > >
> > > > > Thanks.
> > > > >
> > > > > --
> > > > > Dmitry
> > > > >
> > > > >
> > > > > Input: tsc2004 - document ts2004 dt bindings
> > > 
> > > Just noticed that it says ts2004 instead of tsc2004 in the subject.
> > > Otherwise, I am fine with it.
> > > 
> > > Thanks for the assistance.
> > > 
> > > Still no acks or reviews for the other patches in the series.
> > > I would like for someone to test the tsc2005 support to see if it still works.
> > > 
> > > The tsc2004 works very well on the target that I have here.
> > 
> > I folded this patch into the patch #3 and applied everything.
> >
> 
> Great.
> 
> Will this patch series conflict with the patch series to take out the .owner=THIS_MODULE
> from spi_drivers?
> 
> https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1004626.html

If he tries to get them in one pass - probably, but the conflicts should
be trivial and should be easily resolved by SPI maintainer and/or Linus.

Or he could split the patch per-subsystem.

Thanks.

Patch
diff mbox

diff --git a/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt b/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
index 09089a6..b80c04b 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
@@ -1,14 +1,15 @@ 
-* Texas Instruments tsc2005 touchscreen controller
+* Texas Instruments tsc2004 and tsc2005 touchscreen controllers
 
 Required properties:
- - compatible		      : "ti,tsc2005"
- - reg			      : SPI device address
- - spi-max-frequency	      : Maximal SPI speed
+ - compatible		      : "ti,tsc2004" or "ti,tsc2005"
+ - reg			      : Device address
  - interrupts		      : IRQ specifier
- - reset-gpios		      : GPIO specifier
- - vio-supply                 : Regulator specifier
+ - spi-max-frequency	      : Maximum SPI clocking speed of the device
+			        (for tsc2005)
 
 Optional properties:
+ - vio-supply		      : Regulator specifier
+ - reset-gpios		      : GPIO specifier for the controller reset line
  - ti,x-plate-ohms	      : integer, resistance of the touchscreen's X plates
 				in ohm (defaults to 280)
  - ti,esd-recovery-timeout-ms : integer, if the touchscreen does not respond after
@@ -18,6 +19,27 @@  Optional properties:
 
 Example:
 
+&i2c3 {
+	tsc2004@48 {
+		compatible = "ti,tsc2004";
+		reg = <0x48>;
+		vio-supply = <&vio>;
+
+		reset-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;
+		interrupts-extended = <&gpio1 27 IRQ_TYPE_EDGE_RISING>;
+
+		touchscreen-fuzz-x = <4>;
+		touchscreen-fuzz-y = <7>;
+		touchscreen-fuzz-pressure = <2>;
+		touchscreen-size-x = <4096>;
+		touchscreen-size-y = <4096>;
+		touchscreen-max-pressure = <2048>;
+
+		ti,x-plate-ohms = <280>;
+		ti,esd-recovery-timeout-ms = <8000>;
+	};
+}
+
 &mcspi1 {
 	tsc2005@0 {
 		compatible = "ti,tsc2005";