Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe6e91e3 authored by Andrew Lunn's avatar Andrew Lunn
Browse files

Merge branch 'mvebu/fixes-3' into mvebu/soc

parents c6574542 38bdf45f

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Jacob Shin <Jacob.Shin@amd.com>

James Bottomley <jejb@mulgrave.(none)>

Documentation/devicetree/bindings/input/gpio-keys.txt

+7 −3
Original line number Diff line number Diff line
@@ -10,12 +10,13 @@ Optional properties: 
Each button (key) is represented as a sub-node of "gpio-keys":

Subnode properties:



	- gpios: OF device-tree gpio specification.

	- interrupts: the interrupt line for that input.

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.



Required mutual exclusive subnode-properties:

	- gpios: OF device-tree gpio specification.

	- interrupts: the interrupt line for that input

Note that either "interrupts" or "gpios" properties can be omitted, but not

both at the same time. Specifying both properties is allowed.



Optional subnode-properties:

	- linux,input-type: Specify event type this button/key generates.
@@ -23,6 +24,9 @@ Optional subnode-properties: 
	- debounce-interval: Debouncing interval time in milliseconds.

	  If not specified defaults to 5.

	- gpio-key,wakeup: Boolean, button can wake-up the system.

	- linux,can-disable: Boolean, indicates that button is connected

	  to dedicated (not shared) interrupt which can be disabled to

	  suppress events from the button.



Example nodes:

Documentation/devicetree/bindings/input/stmpe-keypad.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Optional properties: 
 - debounce-interval        : Debouncing interval time in milliseconds

 - st,scan-count            : Scanning cycles elapsed before key data is updated

 - st,no-autorepeat         : If specified device will not autorepeat

 - keypad,num-rows          : See ./matrix-keymap.txt

 - keypad,num-columns       : See ./matrix-keymap.txt



Example:

MAINTAINERS

+7 −6
Original line number Diff line number Diff line
@@ -724,15 +724,15 @@ F: include/uapi/linux/apm_bios.h 
F:	drivers/char/apm-emulation.c



APPLE BCM5974 MULTITOUCH DRIVER

M:	Henrik Rydberg <rydberg@euromail.se>

M:	Henrik Rydberg <rydberg@bitmath.org>

L:	linux-input@vger.kernel.org

S:	Maintained

S:	Odd fixes

F:	drivers/input/mouse/bcm5974.c



APPLE SMC DRIVER

M:	Henrik Rydberg <rydberg@euromail.se>

M:	Henrik Rydberg <rydberg@bitmath.org>

L:	lm-sensors@lm-sensors.org

S:	Maintained

S:	Odd fixes

F:	drivers/hwmon/applesmc.c



APPLETALK NETWORK LAYER
@@ -2259,6 +2259,7 @@ F: drivers/gpio/gpio-bt8xx.c 
BTRFS FILE SYSTEM

M:	Chris Mason <clm@fb.com>

M:	Josef Bacik <jbacik@fb.com>

M:	David Sterba <dsterba@suse.cz>

L:	linux-btrfs@vger.kernel.org

W:	http://btrfs.wiki.kernel.org/

Q:	http://patchwork.kernel.org/project/linux-btrfs/list/
@@ -4940,10 +4941,10 @@ F: include/uapi/linux/input.h 
F:	include/linux/input/



INPUT MULTITOUCH (MT) PROTOCOL

M:	Henrik Rydberg <rydberg@euromail.se>

M:	Henrik Rydberg <rydberg@bitmath.org>

L:	linux-input@vger.kernel.org

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

S:	Maintained

S:	Odd fixes

F:	Documentation/input/multi-touch-protocol.txt

F:	drivers/input/input-mt.c

K:	\b(ABS|SYN)_MT_

Makefile

+2 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc4

NAME = Diseased Newt



# *DOCUMENTATION*
@@ -391,6 +391,7 @@ USERINCLUDE := \ 
# Needed to be compatible with the O= option

LINUXINCLUDE    := \

		-I$(srctree)/arch/$(hdr-arch)/include \

		-Iarch/$(hdr-arch)/include/generated/uapi \

		-Iarch/$(hdr-arch)/include/generated \

		$(if $(KBUILD_SRC), -I$(srctree)/include) \

		-Iinclude \