[GIT PULL] input: mt updates for 2.6.38

[GIT PULL] input: mt updates for 2.6.38

[Henrik Rydberg]

Dmitry,

Please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next

to receive input-mt updates for 2.6.38.

The tree contains core changes as well as dependent changes to hid drivers. You
also find the new hid-egalax driver in there, signed off by Jiri.

Thanks,
Henrik

Henrik Rydberg (13):
      input: mt: Break out slots handling
      input: mt: Collect slots initialization code
      input: mt: Add an envelope tool type
      input: mt: Move tracking and pointer emulation to input-mt
      input: mt: Add hovering distance axis
      hid: egalax: Setup input device manually
      hid: egalax: Correct for device resolution report error
      hid: egalax: Report zero as minimum pressure
      hid: egalax: Add event filtering
      hid: egalax: Convert to MT slots
      hid: egalax: Add support for Wetab
      hid: egalax: Document the new devices in Kconfig
      MAINTAINERS: Update input-mt entry

 Documentation/input/multi-touch-protocol.txt |   14 ++-
 MAINTAINERS                                  |    2 +
 drivers/hid/Kconfig                          |    3 +-
 drivers/hid/hid-3m-pct.c                     |   36 +------
 drivers/hid/hid-core.c                       |    1 +
 drivers/hid/hid-egalax.c                     |  127 +++++++++-------------
 drivers/hid/hid-ids.h                        |    1 +
 drivers/input/Makefile                       |    2 +-
 drivers/input/input-mt.c                     |  153 ++++++++++++++++++++++++++
 drivers/input/input.c                        |   48 +--------
 drivers/input/misc/uinput.c                  |    4 +-
 drivers/input/tablet/wacom_wac.c             |   26 +---
 drivers/input/tablet/wacom_wac.h             |    4 -
 drivers/input/touchscreen/wacom_w8001.c      |   25 +---
 include/linux/input-mt.h                     |   56 ++++++++++
 include/linux/input.h                        |   22 +---
 16 files changed, 306 insertions(+), 218 deletions(-)
 create mode 100644 drivers/input/input-mt.c
 create mode 100644 include/linux/input-mt.h

Re: [GIT PULL] input: mt updates for 2.6.38

[Dmitry Torokhov]

On Wed, Dec 08, 2010 at 10:02:52AM +0100, Henrik Rydberg wrote:
> Dmitry,
> 
> Please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
> 
> to receive input-mt updates for 2.6.38.
> 
> The tree contains core changes as well as dependent changes to hid drivers. You
> also find the new hid-egalax driver in there, signed off by Jiri.

Pulled, thank you Henrik.

I wonder if we should move input-mt.h into input/mt.h (and if someone
would bother to input-polldev.h there that would be great too).

Also I try to sync with mainline once per release, at -rc1, unless I
know that my changes will conflict with some other work. I'd recommend
you do the same so that when I pull from you I am getting just your
changes and not the rest of stuff from mainline.

BTW, we need to document dev->trkid to avoid complaints from 'make
htmldocs' and friends. I wonder if the patch below will do.

Thanks.

-- 
Dmitry


Input: document new trkid field in struct input_dev

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

 include/linux/input.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/include/linux/input.h b/include/linux/input.h
index 6914269..56bf497 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1182,6 +1182,7 @@ struct ff_effect {
  *	of tracked contacts
  * @mtsize: number of MT slots the device uses
  * @slot: MT slot currently being transmitted
+ * @trkid: stores MT tracking ID for the current contact
  * @absinfo: array of &struct input_absinfo elements holding information
  *	about absolute axes (current value, min, max, flat, fuzz,
  *	resolution)

Re: [GIT PULL] input: mt updates for 2.6.38

[Dmitry Torokhov]

On Thu, Dec 09, 2010 at 12:58:14AM -0800, Dmitry Torokhov wrote:
> On Wed, Dec 08, 2010 at 10:02:52AM +0100, Henrik Rydberg wrote:
> > Dmitry,
> > 
> > Please pull from
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
> > 
> > to receive input-mt updates for 2.6.38.
> > 
> > The tree contains core changes as well as dependent changes to hid drivers. You
> > also find the new hid-egalax driver in there, signed off by Jiri.
> 
> Pulled, thank you Henrik.
> 
> I wonder if we should move input-mt.h into input/mt.h (and if someone
> would bother to input-polldev.h there that would be great too).
> 
> Also I try to sync with mainline once per release, at -rc1, unless I
> know that my changes will conflict with some other work. I'd recommend
> you do the same so that when I pull from you I am getting just your
> changes and not the rest of stuff from mainline.
> 
> BTW, we need to document dev->trkid to avoid complaints from 'make
> htmldocs' and friends. I wonder if the patch below will do.
> 
> Thanks.
> 

And I think we need this one as well:

Input: include MT library as source for kerneldoc

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

 Documentation/DocBook/device-drivers.tmpl |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index 22edcbb..467beee 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -304,6 +304,10 @@ X!Idrivers/video/console/fonts.c
 !Edrivers/input/ff-core.c
 !Edrivers/input/ff-memless.c
      </sect1>
+     <sect1><title>Multitouch Library</title>
+!Iinclude/linux/input-mt.h
+!Edrivers/input/input-mt.c
+     </sect1>
      <sect1><title>Polled input devices</title>
 !Iinclude/linux/input-polldev.h
 !Edrivers/input/input-polldev.c

-- 
Dmitry

Re: [GIT PULL] input: mt updates for 2.6.38

[Henrik Rydberg]

> Input: include MT library as source for kerneldoc

> 
> From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> 
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> ---


Looks good. Namewise, it means we stick to the current names for a bit, then?

Thanks,
Henrik

Re: [GIT PULL] input: mt updates for 2.6.38

[Dmitry Torokhov]

On Thu, Dec 09, 2010 at 07:27:49PM +0100, Henrik Rydberg wrote:
> > Input: include MT library as source for kerneldoc
> 
> > 
> > From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > 
> > Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> > ---
> 
> 
> Looks good. Namewise, it means we stick to the current names for a bit, then?

I'd prefer moving to input/mt.h before input-mt.h started spreading
throughout the drivers. I could sit on the doc pluggin patch or you can
take it through you tree (adjusting as apporpriate).

-- 
Dmitry

Re: [GIT PULL] input: mt updates for 2.6.38

[Henrik Rydberg]

On 12/09/2010 07:48 PM, Dmitry Torokhov wrote:

> On Thu, Dec 09, 2010 at 07:27:49PM +0100, Henrik Rydberg wrote:
>>> Input: include MT library as source for kerneldoc
>>
>>>
>>> From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>>>
>>> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
>>> ---
>>
>>
>> Looks good. Namewise, it means we stick to the current names for a bit, then?
> 
> I'd prefer moving to input/mt.h before input-mt.h started spreading
> throughout the drivers. I could sit on the doc pluggin patch or you can
> take it through you tree (adjusting as apporpriate).
> 


I'll take it, thanks.

Henrik

Re: [GIT PULL] input: mt updates for 2.6.38

[Henrik Rydberg]

On 12/09/2010 09:58 AM, Dmitry Torokhov wrote:

> On Wed, Dec 08, 2010 at 10:02:52AM +0100, Henrik Rydberg wrote:
>> Dmitry,
>>
>> Please pull from
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
>>
>> to receive input-mt updates for 2.6.38.
>>
>> The tree contains core changes as well as dependent changes to hid drivers. You
>> also find the new hid-egalax driver in there, signed off by Jiri.
> 
> Pulled, thank you Henrik.
> 
> I wonder if we should move input-mt.h into input/mt.h (and if someone
> would bother to input-polldev.h there that would be great too).


Sure, I have been wondering about that too. Right away, or later?

> Also I try to sync with mainline once per release, at -rc1, unless I
> know that my changes will conflict with some other work. I'd recommend
> you do the same so that when I pull from you I am getting just your
> changes and not the rest of stuff from mainline.


No problem - I will see what sync point you end up using, and I will rebase to
the same point.

> BTW, we need to document dev->trkid to avoid complaints from 'make
> htmldocs' and friends. I wonder if the patch below will do.


Looks good, thanks.

Henrik

Re: [GIT PULL] input: mt updates for 2.6.38

[Dmitry Torokhov]

On Thu, Dec 09, 2010 at 07:23:31PM +0100, Henrik Rydberg wrote:
> On 12/09/2010 09:58 AM, Dmitry Torokhov wrote:
> 
> > On Wed, Dec 08, 2010 at 10:02:52AM +0100, Henrik Rydberg wrote:
> >> Dmitry,
> >>
> >> Please pull from
> >>
> >>   git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
> >>
> >> to receive input-mt updates for 2.6.38.
> >>
> >> The tree contains core changes as well as dependent changes to hid drivers. You
> >> also find the new hid-egalax driver in there, signed off by Jiri.
> > 
> > Pulled, thank you Henrik.
> > 
> > I wonder if we should move input-mt.h into input/mt.h (and if someone
> > would bother to input-polldev.h there that would be great too).
> 
> 
> Sure, I have been wondering about that too. Right away, or later?

Better sooner than later as you'll have less places to patch ;)

> 
> > Also I try to sync with mainline once per release, at -rc1, unless I
> > know that my changes will conflict with some other work. I'd recommend
> > you do the same so that when I pull from you I am getting just your
> > changes and not the rest of stuff from mainline.
> 
> 
> No problem - I will see what sync point you end up using, and I will rebase to
> the same point.

No, not rebase, pull please. Public branches should not be rebased, at
least not when they have been pulled from.

> 
> > BTW, we need to document dev->trkid to avoid complaints from 'make
> > htmldocs' and friends. I wonder if the patch below will do.
> 
> 
> Looks good, thanks.

OK. I take it as an acked-by then.

-- 
Dmitry

Re: [GIT PULL] input: mt updates for 2.6.38

[Henrik Rydberg]

On 12/09/2010 07:49 PM, Dmitry Torokhov wrote:

> On Thu, Dec 09, 2010 at 07:23:31PM +0100, Henrik Rydberg wrote:
>> On 12/09/2010 09:58 AM, Dmitry Torokhov wrote:
>>
>>> On Wed, Dec 08, 2010 at 10:02:52AM +0100, Henrik Rydberg wrote:
>>>> Dmitry,
>>>>
>>>> Please pull from
>>>>
>>>>   git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
>>>>
>>>> to receive input-mt updates for 2.6.38.
>>>>
>>>> The tree contains core changes as well as dependent changes to hid drivers. You
>>>> also find the new hid-egalax driver in there, signed off by Jiri.
>>>
>>> Pulled, thank you Henrik.
>>>
>>> I wonder if we should move input-mt.h into input/mt.h (and if someone
>>> would bother to input-polldev.h there that would be great too).
>>
>>
>> Sure, I have been wondering about that too. Right away, or later?
> 
> Better sooner than later as you'll have less places to patch ;)


No problem, will do.

>>
>>> Also I try to sync with mainline once per release, at -rc1, unless I
>>> know that my changes will conflict with some other work. I'd recommend
>>> you do the same so that when I pull from you I am getting just your
>>> changes and not the rest of stuff from mainline.
>>
>>
>> No problem - I will see what sync point you end up using, and I will rebase to
>> the same point.
> 
> No, not rebase, pull please. Public branches should not be rebased, at
> least not when they have been pulled from.


Understood. I was using the term "rebase" to loosely.

Thanks,
Henrik

[GIT PULL] input: mt updates for 2.6.38

[Henrik Rydberg]

Dmitry,

Please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next

to receive input-mt updates for 2.6.38.

The changes have all been discussed on the list, and are mostly janitory in nature.

Thanks,
Henrik

Dmitry Torokhov (2):
      Input: include MT library as source for kerneldoc
      Input: document new trkid field in struct input_dev

Henrik Rydberg (3):
      input: mt: Move input MT header inside input directory
      input: mt: Interface and MT_TOOL documentation updates
      input: mt: Support separate contact and finger count reports

 Documentation/DocBook/device-drivers.tmpl    |    4 ++
 Documentation/input/multi-touch-protocol.txt |   39 ++++++++++++++++++--------
 drivers/hid/hid-3m-pct.c                     |    4 +-
 drivers/hid/hid-egalax.c                     |    4 +-
 drivers/input/input-mt.c                     |   35 +++++++++++++++++------
 drivers/input/input.c                        |    2 +-
 drivers/input/misc/uinput.c                  |    2 +-
 drivers/input/tablet/wacom_wac.c             |    4 +-
 drivers/input/touchscreen/wacom_w8001.c      |    2 +-
 include/linux/input.h                        |    7 ++--
 include/linux/{input-mt.h => input/mt.h}     |    3 +-
 11 files changed, 72 insertions(+), 34 deletions(-)
 rename include/linux/{input-mt.h => input/mt.h} (89%)

Re: [GIT PULL] input: mt updates for 2.6.38

[Dmitry Torokhov]

On Mon, Dec 13, 2010 at 09:29:26AM +0100, Henrik Rydberg wrote:
> Dmitry,
> 
> Please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
> 
> to receive input-mt updates for 2.6.38.
> 
> The changes have all been discussed on the list, and are mostly janitory in nature.
> 

Pulled, thanks Henrik.

-- 
Dmitry

[GIT PULL] input: mt updates for 2.6.38

[Henrik Rydberg]

Dmitry,

Please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next

to re-receive input-mt updates for 2.6.38.

As a one-time measure, the tree has been rewound all the way to 2.6.37-rc1, to
keep our trees at a common checkpoint. Hereafter, the branch will be kept stable
and synchronized at a common checkpoint.

Content-wise, the filename change has been folded into the first commit. The
finger-count report and the trkid documentation have been folded into the commit
where they are introduced. Furthermore, MT_TOOL_ENVELOPE has been dropped
completely, and is going to be replaced by an input device quirk. The overall
documentation changes have been held back for another respin. Lastly, another
device patch has been added to hid-egalax.

Thanks,
Henrik

Dmitry Torokhov (1):
      Input: include MT library as source for kerneldoc

Henrik Rydberg (12):
      input: mt: Break out slots handling
      input: mt: Collect slots initialization code
      input: mt: Move tracking and pointer emulation to input-mt
      input: mt: Add hovering distance axis
      hid: egalax: Setup input device manually
      hid: egalax: Correct for device resolution report error
      hid: egalax: Report zero as minimum pressure
      hid: egalax: Add event filtering
      hid: egalax: Convert to MT slots
      hid: egalax: Add support for Wetab
      hid: egalax: Document the new devices in Kconfig
      MAINTAINERS: Update input-mt entry

Richard Nauber (1):
      hid: egalax: Add support for Samsung NB30 netbook

 Documentation/DocBook/device-drivers.tmpl    |    4 +
 Documentation/input/multi-touch-protocol.txt |    9 ++-
 MAINTAINERS                                  |    2 +
 drivers/hid/Kconfig                          |    3 +-
 drivers/hid/hid-3m-pct.c                     |   36 +-----
 drivers/hid/hid-core.c                       |    2 +
 drivers/hid/hid-egalax.c                     |  129 ++++++++-----------
 drivers/hid/hid-ids.h                        |    2 +
 drivers/input/Makefile                       |    2 +-
 drivers/input/input-mt.c                     |  170 ++++++++++++++++++++++++++
 drivers/input/input.c                        |   48 +-------
 drivers/input/misc/uinput.c                  |    4 +-
 drivers/input/tablet/wacom_wac.c             |   26 +---
 drivers/input/tablet/wacom_wac.h             |    4 -
 drivers/input/touchscreen/wacom_w8001.c      |   25 +---
 include/linux/input.h                        |   22 +---
 include/linux/input/mt.h                     |   57 +++++++++
 17 files changed, 329 insertions(+), 216 deletions(-)
 create mode 100644 drivers/input/input-mt.c
 create mode 100644 include/linux/input/mt.h

Re: [GIT PULL] input: mt updates for 2.6.38

[Dmitry Torokhov]

On Thu, Dec 16, 2010 at 12:37:06PM +0100, Henrik Rydberg wrote:
> Dmitry,
> 
> Please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
> 
> to re-receive input-mt updates for 2.6.38.
> 
> As a one-time measure, the tree has been rewound all the way to 2.6.37-rc1, to
> keep our trees at a common checkpoint. Hereafter, the branch will be kept stable
> and synchronized at a common checkpoint.
> 
> Content-wise, the filename change has been folded into the first commit. The
> finger-count report and the trkid documentation have been folded into the commit
> where they are introduced. Furthermore, MT_TOOL_ENVELOPE has been dropped
> completely, and is going to be replaced by an input device quirk. The overall
> documentation changes have been held back for another respin. Lastly, another
> device patch has been added to hid-egalax.
> 

Pulled, thanks Henrik.

-- 
Dmitry

[GIT PULL] input: mt updates for 2.6.38

[Henrik Rydberg]

Dmitry,

Please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next

to receive input-mt updates for 2.6.38.

The device properties are in there, the synaptics patches are in
there, and another wetab patch is in there.

Merry Christmas,
Henrik

Andy Ross (1):
      hid: egalax: Add support for Wetab (726b)

Henrik Rydberg (6):
      Input: introduce device properties
      Input: fix double equality sign in uevent
      input: mt: Document interface updates
      Input: synaptics - report clickpad property
      Input: synaptics - add multi-finger and semi-mt support
      Input: synaptics - ignore bogus mt packet

 Documentation/input/multi-touch-protocol.txt |   44 +++++++-----
 drivers/hid/hid-core.c                       |    1 +
 drivers/hid/hid-egalax.c                     |    2 +
 drivers/hid/hid-ids.h                        |    1 +
 drivers/input/evdev.c                        |    4 +
 drivers/input/input.c                        |   21 ++++++-
 drivers/input/misc/uinput.c                  |    4 +
 drivers/input/mouse/synaptics.c              |   95 ++++++++++++++++++++++++--
 drivers/input/mouse/synaptics.h              |    3 +
 include/linux/input.h                        |   16 ++++
 include/linux/uinput.h                       |    1 +
 11 files changed, 168 insertions(+), 24 deletions(-)

Re: [GIT PULL] input: mt updates for 2.6.38

[Dmitry Torokhov]

On Thu, Dec 23, 2010 at 04:20:31PM +0100, Henrik Rydberg wrote:
> Dmitry,
> 
> Please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
> 
> to receive input-mt updates for 2.6.38.
> 
> The device properties are in there, the synaptics patches are in
> there, and another wetab patch is in there.
> 

Pulled, thank you Henrik.

-- 
Dmitry