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

Commit 61b80086 authored by Russell King's avatar Russell King
Browse files

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

parents a5f17d1f 230f9846
Loading
Loading
Loading
Loading
+10 −2
Original line number Original line Diff line number Diff line
@@ -102,9 +102,12 @@ X!Iinclude/linux/kobject.h
!Iinclude/linux/device.h
!Iinclude/linux/device.h
     </sect1>
     </sect1>
     <sect1><title>Device Drivers Base</title>
     <sect1><title>Device Drivers Base</title>
!Idrivers/base/init.c
!Edrivers/base/driver.c
!Edrivers/base/driver.c
!Edrivers/base/core.c
!Edrivers/base/core.c
!Edrivers/base/syscore.c
!Edrivers/base/class.c
!Edrivers/base/class.c
!Idrivers/base/node.c
!Edrivers/base/firmware_class.c
!Edrivers/base/firmware_class.c
!Edrivers/base/transport_class.c
!Edrivers/base/transport_class.c
<!-- Cannot be included, because
<!-- Cannot be included, because
@@ -113,13 +116,18 @@ X!Iinclude/linux/kobject.h
     exceed allowed 44 characters maximum
     exceed allowed 44 characters maximum
X!Edrivers/base/attribute_container.c
X!Edrivers/base/attribute_container.c
-->
-->
!Edrivers/base/sys.c
!Edrivers/base/dd.c
<!--
<!--
X!Edrivers/base/interface.c
X!Edrivers/base/interface.c
-->
-->
!Iinclude/linux/platform_device.h
!Iinclude/linux/platform_device.h
!Edrivers/base/platform.c
!Edrivers/base/platform.c
!Edrivers/base/bus.c
!Edrivers/base/bus.c
     </sect1>
     <sect1><title>Device Drivers DMA Management</title>
!Edrivers/base/dma-buf.c
!Edrivers/base/dma-coherent.c
!Edrivers/base/dma-mapping.c
     </sect1>
     </sect1>
     <sect1><title>Device Drivers Power Management</title>
     <sect1><title>Device Drivers Power Management</title>
!Edrivers/base/power/main.c
!Edrivers/base/power/main.c
@@ -219,7 +227,7 @@ X!Isound/sound_firmware.c
  <chapter id="uart16x50">
  <chapter id="uart16x50">
     <title>16x50 UART Driver</title>
     <title>16x50 UART Driver</title>
!Edrivers/tty/serial/serial_core.c
!Edrivers/tty/serial/serial_core.c
!Edrivers/tty/serial/8250.c
!Edrivers/tty/serial/8250/8250.c
  </chapter>
  </chapter>


  <chapter id="fbdev">
  <chapter id="fbdev">
+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.
+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.


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


+19 −31
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ S: Maintained
F:	drivers/net/ethernet/realtek/r8169.c
F:	drivers/net/ethernet/realtek/r8169.c


8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
M:	Greg Kroah-Hartman <gregkh@suse.de>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L:	linux-serial@vger.kernel.org
L:	linux-serial@vger.kernel.org
W:	http://serial.sourceforge.net
W:	http://serial.sourceforge.net
S:	Maintained
S:	Maintained
@@ -789,12 +789,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)
@@ -1783,9 +1777,9 @@ X: net/wireless/wext*


CHAR and MISC DRIVERS
CHAR and MISC DRIVERS
M:	Arnd Bergmann <arnd@arndb.de>
M:	Arnd Bergmann <arnd@arndb.de>
M:	Greg Kroah-Hartman <greg@kroah.com>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
S:	Maintained
S:	Supported
F:	drivers/char/*
F:	drivers/char/*
F:	drivers/misc/*
F:	drivers/misc/*


@@ -2287,7 +2281,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/


@@ -2320,7 +2314,7 @@ F: lib/lru_cache.c
F:	Documentation/blockdev/drbd/
F:	Documentation/blockdev/drbd/


DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
M:	Greg Kroah-Hartman <gregkh@suse.de>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
S:	Supported
S:	Supported
F:	Documentation/kobject.txt
F:	Documentation/kobject.txt
@@ -3992,11 +3986,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 +4130,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>
@@ -5633,7 +5627,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*


@@ -6276,15 +6270,15 @@ S: Maintained
F:	arch/alpha/kernel/srm_env.c
F:	arch/alpha/kernel/srm_env.c


STABLE BRANCH
STABLE BRANCH
M:	Greg Kroah-Hartman <greg@kroah.com>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L:	stable@vger.kernel.org
L:	stable@vger.kernel.org
S:	Maintained
S:	Supported


STAGING SUBSYSTEM
STAGING SUBSYSTEM
M:	Greg Kroah-Hartman <gregkh@suse.de>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
L:	devel@driverdev.osuosl.org
L:	devel@driverdev.osuosl.org
S:	Maintained
S:	Supported
F:	drivers/staging/
F:	drivers/staging/


STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
@@ -6396,11 +6390,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
@@ -6669,8 +6658,8 @@ S: Maintained
K:	^Subject:.*(?i)trivial
K:	^Subject:.*(?i)trivial


TTY LAYER
TTY LAYER
M:	Greg Kroah-Hartman <gregkh@suse.de>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
S:	Maintained
S:	Supported
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
F:	drivers/tty/
F:	drivers/tty/
F:	drivers/tty/serial/serial_core.c
F:	drivers/tty/serial/serial_core.c
@@ -6958,7 +6947,7 @@ S: Maintained
F:	drivers/usb/serial/digi_acceleport.c
F:	drivers/usb/serial/digi_acceleport.c


USB SERIAL DRIVER
USB SERIAL DRIVER
M:	Greg Kroah-Hartman <gregkh@suse.de>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L:	linux-usb@vger.kernel.org
L:	linux-usb@vger.kernel.org
S:	Supported
S:	Supported
F:	Documentation/usb/usb-serial.txt
F:	Documentation/usb/usb-serial.txt
@@ -6973,9 +6962,8 @@ S: Maintained
F:	drivers/usb/serial/empeg.c
F:	drivers/usb/serial/empeg.c


USB SERIAL KEYSPAN DRIVER
USB SERIAL KEYSPAN DRIVER
M:	Greg Kroah-Hartman <greg@kroah.com>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L:	linux-usb@vger.kernel.org
L:	linux-usb@vger.kernel.org
W:	http://www.kroah.com/linux/
S:	Maintained
S:	Maintained
F:	drivers/usb/serial/*keyspan*
F:	drivers/usb/serial/*keyspan*


@@ -7003,7 +6991,7 @@ F: Documentation/video4linux/sn9c102.txt
F:	drivers/media/video/sn9c102/
F:	drivers/media/video/sn9c102/


USB SUBSYSTEM
USB SUBSYSTEM
M:	Greg Kroah-Hartman <gregkh@suse.de>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L:	linux-usb@vger.kernel.org
L:	linux-usb@vger.kernel.org
W:	http://www.linux-usb.org
W:	http://www.linux-usb.org
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
@@ -7090,7 +7078,7 @@ F: fs/hppfs/


USERSPACE I/O (UIO)
USERSPACE I/O (UIO)
M:	"Hans J. Koch" <hjk@hansjkoch.de>
M:	"Hans J. Koch" <hjk@hansjkoch.de>
M:	Greg Kroah-Hartman <gregkh@suse.de>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
S:	Maintained
S:	Maintained
F:	Documentation/DocBook/uio-howto.tmpl
F:	Documentation/DocBook/uio-howto.tmpl
F:	drivers/uio/
F:	drivers/uio/
+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 = -rc3
NAME = Saber-toothed Squirrel
NAME = Saber-toothed Squirrel


# *DOCUMENTATION*
# *DOCUMENTATION*
Loading