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

Commit 7915a2e9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/boot 



Merge this into x86/boot so that we can queue up dependent patches.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 35f1790e 23783f81

Documentation/DocBook/device-drivers.tmpl

+13 −4
Original line number Original line Diff line number Diff line
@@ -50,7 +50,9 @@ 




     <sect1><title>Delaying, scheduling, and timer routines</title>

     <sect1><title>Delaying, scheduling, and timer routines</title>

!Iinclude/linux/sched.h

!Iinclude/linux/sched.h

!Ekernel/sched.c

!Ekernel/sched/core.c

!Ikernel/sched/cpupri.c

!Ikernel/sched/fair.c

!Iinclude/linux/completion.h

!Iinclude/linux/completion.h

!Ekernel/timer.c

!Ekernel/timer.c

     </sect1>

     </sect1>
@@ -100,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
@@ -111,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
@@ -216,9 +226,8 @@ X!Isound/sound_firmware.c 




  <chapter id="uart16x50">

  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!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">

Documentation/DocBook/deviceiobook.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -317,7 +317,7 @@ CPU B: spin_unlock_irqrestore(&amp;dev_lock, flags) 
  <chapter id="pubfunctions">

  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

     <title>Public Functions Provided</title>

!Iarch/x86/include/asm/io.h

!Iarch/x86/include/asm/io.h

!Elib/iomap.c

!Elib/pci_iomap.c

  </chapter>

  </chapter>





</book>
 
</book>

Documentation/driver-model/devres.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -233,6 +233,10 @@ certainly invest a bit more effort into libata core layer). 
  6. List of managed interfaces

  6. List of managed interfaces

  -----------------------------

  -----------------------------





MEM

  devm_kzalloc()

  devm_kfree()



IO region

IO region

  devm_request_region()

  devm_request_region()

  devm_request_mem_region()

  devm_request_mem_region()

Documentation/feature-removal-schedule.txt

+14 −0
Original line number Original line Diff line number Diff line
@@ -510,3 +510,17 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The 
	convert to using pci_scan_root_bus() so they can supply a list of

	convert to using pci_scan_root_bus() so they can supply a list of

	bus resources when the bus is created.

	bus resources when the bus is created.

Who:	Bjorn Helgaas <bhelgaas@google.com>

Who:	Bjorn Helgaas <bhelgaas@google.com>



----------------------------



What:	The CAP9 SoC family will be removed

When:	3.4

Files:	arch/arm/mach-at91/at91cap9.c

	arch/arm/mach-at91/at91cap9_devices.c

	arch/arm/mach-at91/include/mach/at91cap9.h

	arch/arm/mach-at91/include/mach/at91cap9_matrix.h

	arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h

	arch/arm/mach-at91/board-cap9adk.c

Why:	The code is not actively maintained and platforms are now hard to find.

Who:	Nicolas Ferre <nicolas.ferre@atmel.com>

	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

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.