Merge branch 'perf/urgent' into perf/core (737f24bd) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/input/event-codes.txt

+64 −8

Original line number	Original line	Diff line number	Diff line
	@@ -17,11 +17,11 @@ reports supported by a device are also provided by sysfs in
	class/input/event*/device/capabilities/, and the properties of a device are		class/input/event*/device/capabilities/, and the properties of a device are
	provided in class/input/event*/device/properties.		provided in class/input/event*/device/properties.

	Types:		Event types:
	==========		===========
	Types are groupings of codes under a logical input construct. Each type has a		Event types are groupings of codes under a logical input construct. Each
	set of applicable codes to be used in generating events. See the Codes section		type has a set of applicable codes to be used in generating events. See the
	for details on valid codes for each type.		Codes section for details on valid codes for each type.

	* EV_SYN:		* EV_SYN:
	- Used as markers to separate events. Events may be separated in time or in		- Used as markers to separate events. Events may be separated in time or in
	@@ -63,9 +63,9 @@ for details on valid codes for each type.
	* EV_FF_STATUS:		* EV_FF_STATUS:
	- Used to receive force feedback device status.		- Used to receive force feedback device status.

	Codes:		Event codes:
	==========		===========
	Codes define the precise type of event.		Event codes define the precise type of event.

	EV_SYN:		EV_SYN:
	----------		----------
	@@ -220,6 +220,56 @@ EV_PWR:
	EV_PWR events are a special type of event used specifically for power		EV_PWR events are a special type of event used specifically for power
	mangement. Its usage is not well defined. To be addressed later.		mangement. Its usage is not well defined. To be addressed later.

			Device properties:
			=================
			Normally, userspace sets up an input device based on the data it emits,
			i.e., the event types. In the case of two devices emitting the same event
			types, additional information can be provided in the form of device
			properties.

			INPUT_PROP_DIRECT + INPUT_PROP_POINTER:
			--------------------------------------
			The INPUT_PROP_DIRECT property indicates that device coordinates should be
			directly mapped to screen coordinates (not taking into account trivial
			transformations, such as scaling, flipping and rotating). Non-direct input
			devices require non-trivial transformation, such as absolute to relative
			transformation for touchpads. Typical direct input devices: touchscreens,
			drawing tablets; non-direct devices: touchpads, mice.

			The INPUT_PROP_POINTER property indicates that the device is not transposed
			on the screen and thus requires use of an on-screen pointer to trace user's
			movements. Typical pointer devices: touchpads, tablets, mice; non-pointer
			device: touchscreen.

			If neither INPUT_PROP_DIRECT or INPUT_PROP_POINTER are set, the property is
			considered undefined and the device type should be deduced in the
			traditional way, using emitted event types.

			INPUT_PROP_BUTTONPAD:
			--------------------
			For touchpads where the button is placed beneath the surface, such that
			pressing down on the pad causes a button click, this property should be
			set. Common in clickpad notebooks and macbooks from 2009 and onwards.

			Originally, the buttonpad property was coded into the bcm5974 driver
			version field under the name integrated button. For backwards
			compatibility, both methods need to be checked in userspace.

			INPUT_PROP_SEMI_MT:
			------------------
			Some touchpads, most common between 2008 and 2011, can detect the presence
			of multiple contacts without resolving the individual positions; only the
			number of contacts and a rectangular shape is known. For such
			touchpads, the semi-mt property should be set.

			Depending on the device, the rectangle may enclose all touches, like a
			bounding box, or just some of them, for instance the two most recent
			touches. The diversity makes the rectangle of limited use, but some
			gestures can normally be extracted from it.

			If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT
			device.

	Guidelines:		Guidelines:
	==========		==========
	The guidelines below ensure proper single-touch and multi-finger functionality.		The guidelines below ensure proper single-touch and multi-finger functionality.
	@@ -240,6 +290,8 @@ used to report when a touch is active on the screen.
	BTN_{MOUSE,LEFT,MIDDLE,RIGHT} must not be reported as the result of touch		BTN_{MOUSE,LEFT,MIDDLE,RIGHT} must not be reported as the result of touch
	contact. BTN_TOOL_<name> events should be reported where possible.		contact. BTN_TOOL_<name> events should be reported where possible.

			For new hardware, INPUT_PROP_DIRECT should be set.

	Trackpads:		Trackpads:
	----------		----------
	Legacy trackpads that only provide relative position information must report		Legacy trackpads that only provide relative position information must report
	@@ -250,6 +302,8 @@ location of the touch. BTN_TOUCH should be used to report when a touch is active
	on the trackpad. Where multi-finger support is available, BTN_TOOL_<name> should		on the trackpad. Where multi-finger support is available, BTN_TOOL_<name> should
	be used to report the number of touches active on the trackpad.		be used to report the number of touches active on the trackpad.

			For new hardware, INPUT_PROP_POINTER should be set.

	Tablets:		Tablets:
	----------		----------
	BTN_TOOL_<name> events must be reported when a stylus or other tool is active on		BTN_TOOL_<name> events must be reported when a stylus or other tool is active on
	@@ -260,3 +314,5 @@ button may be used for buttons on the tablet except BTN_{MOUSE,LEFT}.
	BTN_{0,1,2,etc} are good generic codes for unlabeled buttons. Do not use		BTN_{0,1,2,etc} are good generic codes for unlabeled buttons. Do not use
	meaningful buttons, like BTN_FORWARD, unless the button is labeled for that		meaningful buttons, like BTN_FORWARD, unless the button is labeled for that
	purpose on the device.		purpose on the device.

			For new hardware, both INPUT_PROP_DIRECT and INPUT_PROP_POINTER should be set.

Documentation/sysctl/kernel.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -601,6 +601,8 @@ can be ORed together:
	instead of using the one provided by the hardware.		instead of using the one provided by the hardware.
	512 - A kernel warning has occurred.		512 - A kernel warning has occurred.
	1024 - A module from drivers/staging was loaded.		1024 - A module from drivers/staging was loaded.
			2048 - The system is working around a severe firmware bug.
			4096 - An out-of-tree module has been loaded.

	==============================================================		==============================================================

MAINTAINERS

+16 −24

Original line number	Original line	Diff line number	Diff line
	@@ -269,7 +269,6 @@ S: Orphan
	F: drivers/platform/x86/wmi.c		F: drivers/platform/x86/wmi.c

	AD1889 ALSA SOUND DRIVER		AD1889 ALSA SOUND DRIVER
	M: Kyle McMartin <kyle@mcmartin.ca>
	M: Thibaut Varene <T-Bone@parisc-linux.org>		M: Thibaut Varene <T-Bone@parisc-linux.org>
	W: http://wiki.parisc-linux.org/AD1889		W: http://wiki.parisc-linux.org/AD1889
	L: linux-parisc@vger.kernel.org		L: linux-parisc@vger.kernel.org
	@@ -789,12 +788,6 @@ F: arch/arm/mach-mx*/
	F: arch/arm/mach-imx/		F: arch/arm/mach-imx/
	F: arch/arm/plat-mxc/		F: arch/arm/plat-mxc/

	ARM/FREESCALE IMX51
	M: Amit Kucheria <amit.kucheria@canonical.com>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained
	F: arch/arm/mach-mx5/

	ARM/FREESCALE IMX6		ARM/FREESCALE IMX6
	M: Shawn Guo <shawn.guo@linaro.org>		M: Shawn Guo <shawn.guo@linaro.org>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	@@ -2287,7 +2280,7 @@ F: drivers/acpi/dock.c
	DOCUMENTATION		DOCUMENTATION
	M: Randy Dunlap <rdunlap@xenotime.net>		M: Randy Dunlap <rdunlap@xenotime.net>
	L: linux-doc@vger.kernel.org		L: linux-doc@vger.kernel.org
	T: quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/		T: quilt http://xenotime.net/kernel-doc-patches/current/
	S: Maintained		S: Maintained
	F: Documentation/		F: Documentation/

	@@ -3053,7 +3046,6 @@ F: drivers/hwspinlock/hwspinlock_*
	F: include/linux/hwspinlock.h		F: include/linux/hwspinlock.h

	HARMONY SOUND DRIVER		HARMONY SOUND DRIVER
	M: Kyle McMartin <kyle@mcmartin.ca>
	L: linux-parisc@vger.kernel.org		L: linux-parisc@vger.kernel.org
	S: Maintained		S: Maintained
	F: sound/parisc/harmony.*		F: sound/parisc/harmony.*
	@@ -3324,6 +3316,12 @@ S: Maintained
	F: net/ieee802154/		F: net/ieee802154/
	F: drivers/ieee802154/		F: drivers/ieee802154/

			IIO SUBSYSTEM AND DRIVERS
			M: Jonathan Cameron <jic23@cam.ac.uk>
			L: linux-iio@vger.kernel.org
			S: Maintained
			F: drivers/staging/iio/

	IKANOS/ADI EAGLE ADSL USB DRIVER		IKANOS/ADI EAGLE ADSL USB DRIVER
	M: Matthieu Castet <castet.matthieu@free.fr>		M: Matthieu Castet <castet.matthieu@free.fr>
	M: Stanislaw Gruszka <stf_xl@wp.pl>		M: Stanislaw Gruszka <stf_xl@wp.pl>
	@@ -3782,7 +3780,7 @@ F: Documentation/kdump/

	KERNEL AUTOMOUNTER v4 (AUTOFS4)		KERNEL AUTOMOUNTER v4 (AUTOFS4)
	M: Ian Kent <raven@themaw.net>		M: Ian Kent <raven@themaw.net>
	L: autofs@linux.kernel.org		L: autofs@vger.kernel.org
	S: Maintained		S: Maintained
	F: fs/autofs4/		F: fs/autofs4/

	@@ -3992,11 +3990,11 @@ M: Rusty Russell <rusty@rustcorp.com.au>
	L: lguest@lists.ozlabs.org		L: lguest@lists.ozlabs.org
	W: http://lguest.ozlabs.org/		W: http://lguest.ozlabs.org/
	S: Odd Fixes		S: Odd Fixes
	F: Documentation/virtual/lguest/		F: arch/x86/include/asm/lguest*.h
	F: arch/x86/lguest/		F: arch/x86/lguest/
	F: drivers/lguest/		F: drivers/lguest/
	F: include/linux/lguest*.h		F: include/linux/lguest*.h
	F: arch/x86/include/asm/lguest*.h		F: tools/lguest/

	LINUX FOR IBM pSERIES (RS/6000)		LINUX FOR IBM pSERIES (RS/6000)
	M: Paul Mackerras <paulus@au.ibm.com>		M: Paul Mackerras <paulus@au.ibm.com>
	@@ -4136,7 +4134,7 @@ L: linux-ntfs-dev@lists.sourceforge.net
	W: http://www.linux-ntfs.org/content/view/19/37/		W: http://www.linux-ntfs.org/content/view/19/37/
	S: Maintained		S: Maintained
	F: Documentation/ldm.txt		F: Documentation/ldm.txt
	F: fs/partitions/ldm.*		F: block/partitions/ldm.*

	LogFS		LogFS
	M: Joern Engel <joern@logfs.org>		M: Joern Engel <joern@logfs.org>
	@@ -4687,7 +4685,7 @@ NTFS FILESYSTEM
	M: Anton Altaparmakov <anton@tuxera.com>		M: Anton Altaparmakov <anton@tuxera.com>
	L: linux-ntfs-dev@lists.sourceforge.net		L: linux-ntfs-dev@lists.sourceforge.net
	W: http://www.tuxera.com/		W: http://www.tuxera.com/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
	S: Supported		S: Supported
	F: Documentation/filesystems/ntfs.txt		F: Documentation/filesystems/ntfs.txt
	F: fs/ntfs/		F: fs/ntfs/
	@@ -5000,9 +4998,8 @@ F: Documentation/blockdev/paride.txt
	F: drivers/block/paride/		F: drivers/block/paride/

	PARISC ARCHITECTURE		PARISC ARCHITECTURE
	M: Kyle McMartin <kyle@mcmartin.ca>
	M: Helge Deller <deller@gmx.de>
	M: "James E.J. Bottomley" <jejb@parisc-linux.org>		M: "James E.J. Bottomley" <jejb@parisc-linux.org>
			M: Helge Deller <deller@gmx.de>
	L: linux-parisc@vger.kernel.org		L: linux-parisc@vger.kernel.org
	W: http://www.parisc-linux.org/		W: http://www.parisc-linux.org/
	Q: http://patchwork.kernel.org/project/linux-parisc/list/		Q: http://patchwork.kernel.org/project/linux-parisc/list/
	@@ -5633,7 +5630,7 @@ W: http://www.ibm.com/developerworks/linux/linux390/
	S: Supported		S: Supported
	F: arch/s390/		F: arch/s390/
	F: drivers/s390/		F: drivers/s390/
	F: fs/partitions/ibm.c		F: block/partitions/ibm.c
	F: Documentation/s390/		F: Documentation/s390/
	F: Documentation/DocBook/s390*		F: Documentation/DocBook/s390*

	@@ -5861,7 +5858,7 @@ S: Maintained
	F: drivers/mmc/host/sdhci-spear.c		F: drivers/mmc/host/sdhci-spear.c

	SECURITY SUBSYSTEM		SECURITY SUBSYSTEM
	M: James Morris <jmorris@namei.org>		M: James Morris <james.l.morris@oracle.com>
	L: linux-security-module@vger.kernel.org (suggested Cc:)		L: linux-security-module@vger.kernel.org (suggested Cc:)
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
	W: http://security.wiki.kernel.org/		W: http://security.wiki.kernel.org/
	@@ -5874,7 +5871,7 @@ S: Supported

	SELINUX SECURITY MODULE		SELINUX SECURITY MODULE
	M: Stephen Smalley <sds@tycho.nsa.gov>		M: Stephen Smalley <sds@tycho.nsa.gov>
	M: James Morris <jmorris@namei.org>		M: James Morris <james.l.morris@oracle.com>
	M: Eric Paris <eparis@parisplace.org>		M: Eric Paris <eparis@parisplace.org>
	L: selinux@tycho.nsa.gov (subscribers-only, general discussion)		L: selinux@tycho.nsa.gov (subscribers-only, general discussion)
	W: http://selinuxproject.org		W: http://selinuxproject.org
	@@ -6396,11 +6393,6 @@ M: Omar Ramirez Luna <omar.ramirez@ti.com>
	S: Odd Fixes		S: Odd Fixes
	F: drivers/staging/tidspbridge/		F: drivers/staging/tidspbridge/

	STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
	L: linux-media@vger.kernel.org
	S: Odd Fixes
	F: drivers/staging/tm6000/

	STAGING - USB ENE SM/MS CARD READER DRIVER		STAGING - USB ENE SM/MS CARD READER DRIVER
	M: Al Cho <acho@novell.com>		M: Al Cho <acho@novell.com>
	S: Odd Fixes		S: Odd Fixes

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 3		PATCHLEVEL = 3
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc2		EXTRAVERSION = -rc5
	NAME = Saber-toothed Squirrel		NAME = Saber-toothed Squirrel

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/boot/dts/exynos4210.dtsi

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@
	compatible = "arm,cortex-a9-gic";		compatible = "arm,cortex-a9-gic";
	#interrupt-cells = <3>;		#interrupt-cells = <3>;
	interrupt-controller;		interrupt-controller;
			cpu-offset = <0x8000>;
	reg = <0x10490000 0x1000>, <0x10480000 0x100>;		reg = <0x10490000 0x1000>, <0x10480000 0x100>;
	};		};