-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/dtor/input Pull input layer updates from Dmitry Torokhov: - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics Navpoint, LM8333 keypads, Wacom I2C touhscreen); - updates to existing touchpad drivers (ALPS, Sntelic); - Wacom driver now supports Intuos5; - device-tree bindings in numerous drivers; - other cleanups and fixes. Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think implies that the input layer device naming is broken, but let's see. I brough it up with Dmitry. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits) Input: matrix-keymap - fix building keymaps Input: spear-keyboard - document DT bindings Input: spear-keyboard - add device tree bindings Input: matrix-keymap - wire up device tree support Input: matrix-keymap - uninline and prepare for device tree support Input: adp5588 - add support for gpio names Input: omap-keypad - dynamically handle register offsets Input: synaptics - fix compile warning MAINTAINERS: adjust input-related patterns Input: ALPS - switch to using input_mt_report_finger_count Input: ALPS - add semi-MT support for v4 protocol Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver Input: atmel_mxt_ts - dump each message on just 1 line Input: atmel_mxt_ts - do not read extra (checksum) byte Input: atmel_mxt_ts - verify object size in mxt_write_object Input: atmel_mxt_ts - only allow root to update firmware Input: atmel_mxt_ts - use CONFIG_PM_SLEEP Input: sentelic - report device's production serial number Input: tl6040-vibra - Device Tree support Input: evdev - properly handle read/write with count 0 ...
- Loading branch information
Showing
106 changed files
with
2,845 additions
and
1,305 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
Documentation/devicetree/bindings/input/spear-keyboard.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
* SPEAr keyboard controller | ||
|
||
Required properties: | ||
- compatible: "st,spear300-kbd" | ||
|
||
Optional properties, in addition to those specified by the shared | ||
matrix-keyboard bindings: | ||
- autorepeat: bool: enables key autorepeat | ||
- st,mode: keyboard mode: 0 - 9x9, 1 - 6x6, 2 - 2x2 | ||
|
||
Example: | ||
|
||
kbd@fc400000 { | ||
compatible = "st,spear300-kbd"; | ||
reg = <0xfc400000 0x100>; | ||
linux,keymap = < 0x00030012 | ||
0x0102003a >; | ||
autorepeat; | ||
st,mode = <0>; | ||
}; |
16 changes: 16 additions & 0 deletions
16
Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
* NXP LPC32xx SoC Touchscreen Controller (TSC) | ||
|
||
Required properties: | ||
- compatible: must be "nxp,lpc3220-tsc" | ||
- reg: physical base address of the controller and length of memory mapped | ||
region. | ||
- interrupts: The TSC/ADC interrupt | ||
|
||
Example: | ||
|
||
tsc@40048000 { | ||
compatible = "nxp,lpc3220-tsc"; | ||
reg = <0x40048000 0x1000>; | ||
interrupt-parent = <&mic>; | ||
interrupts = <39 0>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
Vibra driver for the twl6040 family | ||
|
||
The vibra driver is a child of the twl6040 MFD dirver. | ||
Documentation/devicetree/bindings/mfd/twl6040.txt | ||
|
||
Required properties: | ||
- compatible : Must be "ti,twl6040-vibra"; | ||
- interrupts: 4, Vibra overcurrent interrupt | ||
- vddvibl-supply: Regulator supplying the left vibra motor | ||
- vddvibr-supply: Regulator supplying the right vibra motor | ||
- vibldrv_res: Board specific left driver resistance | ||
- vibrdrv_res: Board specific right driver resistance | ||
- viblmotor_res: Board specific left motor resistance | ||
- vibrmotor_res: Board specific right motor resistance | ||
|
||
Optional properties: | ||
- vddvibl_uV: If the vddvibl default voltage need to be changed | ||
- vddvibr_uV: If the vddvibr default voltage need to be changed | ||
|
||
Example: | ||
/* | ||
* 8-channel high quality low-power audio codec | ||
* http://www.ti.com/lit/ds/symlink/twl6040.pdf | ||
*/ | ||
twl6040: twl6040@4b { | ||
... | ||
twl6040_vibra: twl6040@1 { | ||
compatible = "ti,twl6040-vibra"; | ||
interrupts = <4>; | ||
vddvibl-supply = <&vbat>; | ||
vddvibr-supply = <&vbat>; | ||
vibldrv_res = <8>; | ||
vibrdrv_res = <3>; | ||
viblmotor_res = <10>; | ||
vibrmotor_res = <10>; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.