LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [git pull] Input updates for 2.6.37-rc0
@ 2011-01-07  6:54 Dmitry Torokhov
  2011-01-07  6:56 ` [git pull] Input updates for 2.6.38-rc0 Dmitry Torokhov
                   ` (5 more replies)
  0 siblings, 6 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2011-01-07  6:54 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andrew Morton, linux-kernel, linux-input

Hi Linus,

Please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
	master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus

to receive first round of updates for the input subsystem.

As an exception, a few HID drivers are coming through my tree instead of
Jiri's in this merge window, because they depend on MT protocol changes.

There will be a conflict in drivers/input/keyboard/Kconfig due to
tc3589x keypad driver coming from ux500 tree and clashing with SPEAR
keypad driver. If you could resolve by having SPEAR entry first and
tc3589x next to it that would be great, otherwise I can pull your tree
and resolve conflict myself.

Thanks!

Changelog:
---------

Ajay Ramaswamy (1):
      Input: wacom - add support for digitizer in Lenovo W700

Andres Salomon (2):
      Input: psmouse - fix up Synaptics comment
      Input: psmouse - disable the synaptics extension on OLPC machines

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

Axel Lin (7):
      Input: xpad - return proper error in error path
      Input: xpad - fix a memory leak
      Input: xpad - fix resource reclaim in xpad_probe error path
      Input: xpad - ensure xpad->bulk_out is initialized before submitting urb
      Input: ps2mult - fix wrong kfree in ps2mult_connect error path
      Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exit
      Input: ct82c710 - remove a redundant serio_register_port()

Chris Leech (1):
      Input: qt602240_ts - fix wrong sizeof in object table allocation

Daniel Drake (5):
      Input: hgpk - support GlideSensor and PenTablet modes
      Input: hgpk - rework spew detection
      Input: hgpk - extend jumpiness detection
      Input: hgpk - detect simple mode overflows
      Input: hgpk - recalibration tweaks

David Sterba (1):
      Input: bu21013_ts - fix misuse of logical operation in place of bitop

Dmitry Torokhov (10):
      Input: xpad - remove useless check in xpad_remove
      Input: pcf_keypad - convert to dev_op_ops
      Input: mac mouse emulation - add locking
      Input: qt602240_ts - convert to using dev_pm_ops
      Input: serio - convert to common workqueue instead of a thread
      Input: gameport - convert to use common workqueue instead of a thread
      Input: clean up Makefile (use input-core-y)
      Input: iforce - clean up Makefile
      Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE
      Input: include MT library as source for kerneldoc

Hemanth V (1):
      Input: add CMA3000 accelerometer driver

Henrik Rydberg (18):
      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
      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

Jesper Juhl (1):
      Input: serio HIL MLC - don't deref null, don't leak and return proper error

Joe Perches (2):
      Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ use
      Input: use pr_fmt and pr_<level>

Pali Rohár (1):
      Input: i8042 - add Acer Aspire 5100 to the Dritek list

Paul Fox (1):
      Input: hgpk - fix powersave mode

Ping Cheng (2):
      Input: wacom_w8001 - use __set_bit to set keybits
      Input: wacom_w8001 - support pen or touch only devices

Rajeev Kumar (1):
      Input: add support for keyboards on ST SPEAr platform

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

Tony SIM (2):
      Input: tca6416-keypad - add support for tca6408a
      Input: add ST1232 touchscreen controller driver


Diffstat:
--------

 Documentation/DocBook/device-drivers.tmpl    |    4 +
 Documentation/input/cma3000_d0x.txt          |  115 +++++
 Documentation/input/multi-touch-protocol.txt |   53 ++-
 MAINTAINERS                                  |    2 +
 arch/arm/plat-spear/include/plat/keyboard.h  |  141 ++++++
 drivers/hid/Kconfig                          |    3 +-
 drivers/hid/hid-3m-pct.c                     |   36 +--
 drivers/hid/hid-core.c                       |    3 +
 drivers/hid/hid-egalax.c                     |  131 +++---
 drivers/hid/hid-ids.h                        |    3 +
 drivers/input/Makefile                       |    2 +-
 drivers/input/apm-power.c                    |   14 +-
 drivers/input/evbug.c                        |   18 +-
 drivers/input/evdev.c                        |   19 +-
 drivers/input/ff-core.c                      |   11 +-
 drivers/input/ff-memless.c                   |   31 +-
 drivers/input/gameport/gameport.c            |  152 +++---
 drivers/input/input-mt.c                     |  170 +++++++
 drivers/input/input-polldev.c                |    5 +-
 drivers/input/input.c                        |   91 ++---
 drivers/input/joydev.c                       |    4 +-
 drivers/input/joystick/iforce/Makefile       |   15 +-
 drivers/input/joystick/xpad.c                |  123 +++--
 drivers/input/keyboard/Kconfig               |   19 +-
 drivers/input/keyboard/Makefile              |    1 +
 drivers/input/keyboard/spear-keyboard.c      |  344 +++++++++++++
 drivers/input/keyboard/tca6416-keypad.c      |   13 +-
 drivers/input/misc/Kconfig                   |   24 +
 drivers/input/misc/Makefile                  |    2 +
 drivers/input/misc/cma3000_d0x.c             |  398 +++++++++++++++
 drivers/input/misc/cma3000_d0x.h             |   42 ++
 drivers/input/misc/cma3000_d0x_i2c.c         |  143 ++++++
 drivers/input/misc/pcf8574_keypad.c          |   19 +-
 drivers/input/misc/uinput.c                  |    8 +-
 drivers/input/mouse/hgpk.c                   |  695 +++++++++++++++++++++++---
 drivers/input/mouse/hgpk.h                   |   31 ++-
 drivers/input/mouse/psmouse-base.c           |    1 +
 drivers/input/mouse/synaptics.c              |  129 +++++-
 drivers/input/mouse/synaptics.h              |    3 +
 drivers/input/mousedev.c                     |   10 +-
 drivers/input/serio/ams_delta_serio.c        |    1 -
 drivers/input/serio/ct82c710.c               |    8 +-
 drivers/input/serio/hil_mlc.c                |    5 +
 drivers/input/serio/hp_sdc_mlc.c             |   18 +-
 drivers/input/serio/i8042-x86ia64io.h        |   37 +-
 drivers/input/serio/i8042.c                  |   92 ++--
 drivers/input/serio/i8042.h                  |   14 +-
 drivers/input/serio/ps2mult.c                |    2 +-
 drivers/input/serio/serio.c                  |  155 +++----
 drivers/input/tablet/wacom.h                 |    1 +
 drivers/input/tablet/wacom_wac.c             |   33 +-
 drivers/input/tablet/wacom_wac.h             |    4 -
 drivers/input/touchscreen/Kconfig            |   22 +-
 drivers/input/touchscreen/Makefile           |    1 +
 drivers/input/touchscreen/bu21013_ts.c       |    2 +-
 drivers/input/touchscreen/qt602240_ts.c      |   21 +-
 drivers/input/touchscreen/st1232.c           |  274 ++++++++++
 drivers/input/touchscreen/wacom_w8001.c      |   71 ++--
 drivers/input/xen-kbdfront.c                 |   10 +-
 drivers/macintosh/mac_hid.c                  |    8 +
 include/linux/input.h                        |   38 +-
 include/linux/input/cma3000.h                |   59 +++
 include/linux/input/mt.h                     |   57 +++
 include/linux/uinput.h                       |    1 +
 64 files changed, 3209 insertions(+), 753 deletions(-)
 create mode 100644 Documentation/input/cma3000_d0x.txt
 create mode 100644 arch/arm/plat-spear/include/plat/keyboard.h
 create mode 100644 drivers/input/input-mt.c
 create mode 100644 drivers/input/keyboard/spear-keyboard.c
 create mode 100644 drivers/input/misc/cma3000_d0x.c
 create mode 100644 drivers/input/misc/cma3000_d0x.h
 create mode 100644 drivers/input/misc/cma3000_d0x_i2c.c
 create mode 100644 drivers/input/touchscreen/st1232.c
 create mode 100644 include/linux/input/cma3000.h
 create mode 100644 include/linux/input/mt.h

-- 
Dmitry


^ permalink raw reply	[flat|nested] 9+ messages in thread
* [git pull] Input updates for 2.6.37-rc0
@ 2010-10-31 15:28 Dmitry Torokhov
  0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2010-10-31 15:28 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andrew Morton, linux-kernel, linux-input

Hi Linus,

Please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
	master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus

to receive updates for the input subsystem.

Changelog:
---------

Dan Carpenter (1):
      Input: bu21013_ts - fix null dereference in error handling

Joe Perches (1):
      Input: appletouch - remove extra KERN_DEBUG use from dprintk

Michael Hennerich (1):
      Input: ad7879 - prevent invalid finger data reports


Diffstat:
--------

 drivers/input/mouse/appletouch.c       |    2 +-
 drivers/input/touchscreen/ad7879.c     |   32 +++++++++++++++++++++++++++-----
 drivers/input/touchscreen/bu21013_ts.c |    2 +-
 3 files changed, 29 insertions(+), 7 deletions(-)

-- 
Dmitry


^ permalink raw reply	[flat|nested] 9+ messages in thread
* [git pull] Input updates for 2.6.37-rc0
@ 2010-10-25  5:17 Dmitry Torokhov
  0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2010-10-25  5:17 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andrew Morton, linux-kernel, linux-input

Hi Linus,

Please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
	master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus

to receive updates for the input subsystem.

Changelog:
---------

Abraham Arce (4):
      Input: add support for OMAP4 keyboard controller
      Input: omap4-keypad - use platform device helpers
      Input: omap4-keypad - SYSCONFIG register configuration
      Input: omap4-keypad - fix interrupt line configuration

Alan Cox (1):
      Staging: mrst_touchscreen - clean up input side

Alek Du (1):
      Staging: mrst-touchscreen - register platform interface

Andy Ross (1):
      Staging: mrst-touchscreen - simplify en/disable of interrupts for NEC

Arjan van de Ven (1):
      Staging: mrst-touchscreen - fix channel allocation

Axel Lin (7):
      Input: s3c2410_ts - fix s3c2410ts_probe error path
      Input: tps6507x-ts - add missing call to platform_set_drvdata()
      Input: tps6507x-ts - properly unregister input device on removal
      Input: tsc2007 - fix a redundant assignment for pdata
      Input: stmpe-ts - remove input_free_device() in stmpe_ts_remove()
      Input: stmpe-ts - return -ENOMEM when memory allocation fails
      Input: wm97xx-core - simplify error path in wm97xx_probe()

Chris Bagwell (4):
      Input: wacom - request tablet data for Bamboo Pens
      Input: wacom - move Bamboo Touch irq to its own function
      Input: wacom - add support for Bamboo Pen
      Input: wacom - disable Bamboo touchpad when pen is being used

Christoph Fritz (1):
      Input: i8042 - use unsigned char for 0x90

Davidlohr Bueso (1):
      Input: return -ENOMEM in select drivers when memory allocation fails

Dmitry Eremin-Solenikov (2):
      Input: serio - support multiple child devices per single parent
      Input: serio - add support for PS2Mult multiplexer protocol

Dmitry Torokhov (21):
      Staging: mrst_touchscreen - more fixes
      Input: mrst-touchscreen - move out of staging
      Input: fix a few typos
      Input: sparse-keymap - switch to using new keycode interface
      Input: media/IR - switch to using new keycode interface
      Input: hid-input - switch to using new keycode interface
      Input: serio - do not include linux/freezer.h
      Input: serio_driver - mark id_table and description as const
      Input: serio_driver - drop private pointer
      Input: gameport_driver - mark description as const pointer
      Input: gameport_driver - drop private pointer
      Input: ati_remote2 - switch to using new keycode interface
      Input: hid-input - allow mapping unknown usages
      Input: fm801-gp - add missing call to pci_disable_device()
      Input: sysrq - add locking to sysrq_filter()
      Input: emu10k1 - do not leave device enabled when probe fails
      Input: twl4030_keypad - fix error handling path
      Input: synaptics - simplify pass-through port handling
      Input: wacom - properly enable runtime PM
      Input: ad7877 - use attribute group to control visibility of attributes
      Input: ad7877 - switch to using threaded IRQ

Dzianis Kahanovich (1):
      Input: hil_kbd - add missing MODULE_DEVICE_TABLE()

Eric Millbrandt (1):
      Input: wm97xx-core - add retries to wm97xx_read_aux_adc

Henrik Rydberg (4):
      Input: wacom - add fuzz parameters to features
      Input: wacom - collect device quirks into single function
      Input: wacom - add support for the Bamboo Touch trackpad
      Input: wacom - add a quirk for low resolution Bamboo devices

Hitoshi Mitake (1):
      Input: mousedev - correct lockdep annotation

James Ketrenos (1):
      Input: cy8ctmg110 - add fuzz to ABS_X and ABS_Y to remove jitter

Jason Wang (1):
      Input: ads7846 - switch to using threaded IRQ

Kevin Wells (1):
      Input: add LPC32xx touchscreen controller driver

Mauro Carvalho Chehab (1):
      Input: add support for large scancodes

Michael Hennerich (4):
      Input: ad7877 - implement specified chip select behavior
      Input: ad7877 - implement EV_KEY:BTN_TOUCH reporting
      Input: ad7877 - filter events where pressure is beyond the maximum
      Input: adp5588-keys - use more obvious i2c_device_id name string

Mike Turquette (1):
      Input: omap4-keypad - wake-up on events & long presses

Naveen Kumar Gaddipati (1):
      Input: add ROHM BU21013 touch panel controller support

Nicolas Kaiser (1):
      Input: ab8500-ponkey - fix IRQ freeing in error path

Peter Hutterer (3):
      Input: wacom_w8001 - send BTN_TOOL_PEN/RUBBER and BTN_STYLUS events
      Input: wacom_w8001 - support (and ignore) touch tablets
      Input: wacom_w8001 - add multitouch slot support

Ping Cheng (2):
      Input: wacom - parse the Bamboo device family
      Input: wacom - specify Cinitq supported tools

Rahul Ruikar (1):
      Input: emu10k1-gp - add missing calls to pci_disable_device()

Sundar Iyer (2):
      Input: add support for Nomadik SKE keypad controller
      ux500 - add platform data for Nomadik SKE keypad controller

Sundar R Iyer (1):
      Input: add support for PowerOn button on the AB8500 MFD

Tejun Heo (1):
      Input: hp680_ts_input - use cancel_delayed_work_sync()

Xing Wei (3):
      Input: add support for Hanwang tablets
      Input: hanwang - make compatible with xf86-input-wacom driver
      Input: hanwang - add support for Art Master HD 5012 tablet


Diffstat:
--------

 arch/arm/mach-ux500/board-mop500.c                 |  129 +++
 arch/arm/mach-ux500/clock.c                        |    1 +
 arch/arm/mach-ux500/devices-db8500.c               |   20 +
 arch/arm/mach-ux500/include/mach/devices.h         |    1 +
 arch/arm/mach-ux500/pins-db8500.h                  |   32 +-
 arch/arm/plat-nomadik/include/plat/ske.h           |   50 ++
 arch/arm/plat-omap/include/plat/omap4-keypad.h     |   14 +
 drivers/char/keyboard.c                            |   31 +-
 drivers/char/sysrq.c                               |   15 +-
 drivers/hid/hid-core.c                             |    5 +
 drivers/hid/hid-ids.h                              |    4 +
 drivers/hid/hid-input.c                            |  108 ++-
 drivers/input/evdev.c                              |  100 ++-
 drivers/input/gameport/emu10k1-gp.c                |   44 +-
 drivers/input/gameport/fm801-gp.c                  |   10 +-
 drivers/input/input.c                              |  198 ++++--
 drivers/input/keyboard/Kconfig                     |   19 +
 drivers/input/keyboard/Makefile                    |    2 +
 drivers/input/keyboard/adp5588-keys.c              |    2 +-
 drivers/input/keyboard/hil_kbd.c                   |    2 +
 drivers/input/keyboard/nomadik-ske-keypad.c        |  408 +++++++++
 drivers/input/keyboard/omap4-keypad.c              |  318 +++++++
 drivers/input/keyboard/twl4030_keypad.c            |    7 +-
 drivers/input/misc/Kconfig                         |   10 +
 drivers/input/misc/Makefile                        |    1 +
 drivers/input/misc/ab8500-ponkey.c                 |  157 ++++
 drivers/input/misc/ati_remote2.c                   |   93 ++-
 drivers/input/misc/powermate.c                     |    2 +-
 drivers/input/mouse/elantech.c                     |    2 +-
 drivers/input/mouse/psmouse-base.c                 |    4 +-
 drivers/input/mouse/synaptics.c                    |   38 +-
 drivers/input/mouse/synaptics.h                    |    2 +
 drivers/input/mouse/trackpoint.c                   |    2 +-
 drivers/input/mousedev.c                           |    2 +-
 drivers/input/serio/Kconfig                        |    9 +
 drivers/input/serio/Makefile                       |    1 +
 drivers/input/serio/i8042.c                        |    2 +-
 drivers/input/serio/ps2mult.c                      |  318 +++++++
 drivers/input/serio/serio.c                        |  125 ++-
 drivers/input/sparse-keymap.c                      |   81 ++-
 drivers/input/tablet/Kconfig                       |   11 +
 drivers/input/tablet/Makefile                      |    1 +
 drivers/input/tablet/hanwang.c                     |  446 ++++++++++
 drivers/input/tablet/wacom.h                       |    1 +
 drivers/input/tablet/wacom_sys.c                   |   77 ++-
 drivers/input/tablet/wacom_wac.c                   |  253 ++++++-
 drivers/input/tablet/wacom_wac.h                   |   15 +
 drivers/input/touchscreen/Kconfig                  |   34 +
 drivers/input/touchscreen/Makefile                 |    3 +
 drivers/input/touchscreen/ad7877.c                 |  144 ++--
 drivers/input/touchscreen/ads7846.c                |  886 ++++++++++----------
 drivers/input/touchscreen/bu21013_ts.c             |  648 ++++++++++++++
 drivers/input/touchscreen/cy8ctmg110_ts.c          |    4 +-
 drivers/input/touchscreen/hp680_ts_input.c         |    6 +-
 drivers/input/touchscreen/intel-mid-touch.c        |  687 +++++++++++++++
 drivers/input/touchscreen/lpc32xx_ts.c             |  411 +++++++++
 drivers/input/touchscreen/s3c2410_ts.c             |    2 +-
 drivers/input/touchscreen/stmpe-ts.c               |   11 +-
 drivers/input/touchscreen/tps6507x-ts.c            |    3 +-
 drivers/input/touchscreen/tsc2007.c                |    2 +-
 drivers/input/touchscreen/wacom_w8001.c            |  185 ++++-
 drivers/input/touchscreen/wm97xx-core.c            |   18 +-
 drivers/media/IR/ir-keytable.c                     |  393 ++++++---
 drivers/mfd/ab8500-core.c                          |   20 +
 drivers/staging/Kconfig                            |    2 -
 drivers/staging/Makefile                           |    1 -
 drivers/staging/mrst-touchscreen/Kconfig           |    7 -
 drivers/staging/mrst-touchscreen/Makefile          |    3 -
 drivers/staging/mrst-touchscreen/TODO              |    2 -
 drivers/staging/mrst-touchscreen/intel-mid-touch.c |  864 -------------------
 include/linux/gameport.h                           |    4 +-
 include/linux/input.h                              |   57 +-
 include/linux/input/bu21013.h                      |   44 +
 include/linux/serio.h                              |   10 +-
 include/media/rc-map.h                             |    2 +-
 75 files changed, 5781 insertions(+), 1845 deletions(-)
 create mode 100644 arch/arm/plat-nomadik/include/plat/ske.h
 create mode 100644 arch/arm/plat-omap/include/plat/omap4-keypad.h
 create mode 100644 drivers/input/keyboard/nomadik-ske-keypad.c
 create mode 100644 drivers/input/keyboard/omap4-keypad.c
 create mode 100644 drivers/input/misc/ab8500-ponkey.c
 create mode 100644 drivers/input/serio/ps2mult.c
 create mode 100644 drivers/input/tablet/hanwang.c
 create mode 100644 drivers/input/touchscreen/bu21013_ts.c
 create mode 100644 drivers/input/touchscreen/intel-mid-touch.c
 create mode 100644 drivers/input/touchscreen/lpc32xx_ts.c
 delete mode 100644 drivers/staging/mrst-touchscreen/Kconfig
 delete mode 100644 drivers/staging/mrst-touchscreen/Makefile
 delete mode 100644 drivers/staging/mrst-touchscreen/TODO
 delete mode 100644 drivers/staging/mrst-touchscreen/intel-mid-touch.c
 create mode 100644 include/linux/input/bu21013.h

-- 
Dmitry


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2011-02-23 16:59 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-07  6:54 [git pull] Input updates for 2.6.37-rc0 Dmitry Torokhov
2011-01-07  6:56 ` [git pull] Input updates for 2.6.38-rc0 Dmitry Torokhov
2011-01-12  6:09 ` [git pull] Input updates for 2.6.38-rc0 (round 2) Dmitry Torokhov
2011-01-26  4:57 ` [git pull] Input updates for 2.6.38-rc2 Dmitry Torokhov
2011-01-29  7:23 ` Dmitry Torokhov
2011-02-15 16:41 ` [git pull] Input updates for 2.6.38-rc4 Dmitry Torokhov
2011-02-23 16:59 ` [git pull] Input updates for 2.6.38-rc6 Dmitry Torokhov
  -- strict thread matches above, loose matches on Subject: below --
2010-10-31 15:28 [git pull] Input updates for 2.6.37-rc0 Dmitry Torokhov
2010-10-25  5:17 Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).