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

Commit ff658f46 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-board-for-v3.5' of... 

Merge tag 'omap-board-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards

Board specific changes for omap.

Note that these are based on omap-pm-regulator-for-v3.5 as
both branches are adding twl regulators.

By Paul Gortmaker (8) and others
via Linus Torvalds (38) and others
* tag 'omap-board-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  OMAP: omap4panda: Use common configuration for V1V8, V2V1 supplies
  OMAP: 4430SDP: Use common configuration for V1V8, V2V1 supplies
  OMAP4: twl-common: Add twl6030 V1V8, V2V1 SMPS common configuration
  ARM: OMAP: Mark Beagleboard-xM MMC bus as 4-bit
  Add MSUB support for the LogicPD OMAP3530 DevKits
  ARM: OMAP: rx51: Platform support for lis3lv02d accelerometer
  ARM: OMAP2+: craneboard: register emac device
  ARM: OMAP4: board-omap4panda: Register platform device for HDMI audio codec
  ARM: OMAP4: board-4430sdp: Register platform device for HDMI audio codec
  ARM: OMAP: devices: Register platform devices for HDMI audio
  ARM: OMAP3: igep0020: Add support for Micron NAND Flash storage memory
  ARM: OMAP2+: nand: Make board_onenand_init() visible to board code
  ARM: OMAP3: cm-t35: add support for power off
  ARM: OMAP: WiLink platform data for the PandaBoard
  ARM: OMAP2PLUS: Enable HIGHMEM
  ARM: OMAP: omap2plus_defconfig: Enable ehci-omap and sms95xx support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents afeb36f1 8500746f

Documentation/ABI/testing/sysfs-bus-hsi

0 → 100644
+19 −0
Original line number Original line Diff line number Diff line 
What:		/sys/bus/hsi

Date:		April 2012

KernelVersion:	3.4

Contact:	Carlos Chinea <carlos.chinea@nokia.com>

Description:

		High Speed Synchronous Serial Interface (HSI) is a

		serial interface mainly used for connecting application

		engines (APE) with cellular modem engines (CMT) in cellular

		handsets.

		The bus will be populated with devices (hsi_clients) representing

		the protocols available in the system. Bus drivers implement

		those protocols.



What:		/sys/bus/hsi/devices/.../modalias

Date:		April 2012

KernelVersion:	3.4

Contact:	Carlos Chinea <carlos.chinea@nokia.com>

Description:	Stores the same MODALIAS value emitted by uevent

		Format: hsi:<hsi_client device name>

Documentation/power/freezing-of-tasks.txt

+19 −18
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ architectures). 




II. How does it work?

II. How does it work?





There are four per-task flags used for that, PF_NOFREEZE, PF_FROZEN, TIF_FREEZE

There are three per-task flags used for that, PF_NOFREEZE, PF_FROZEN

and PF_FREEZER_SKIP (the last one is auxiliary).  The tasks that have

and PF_FREEZER_SKIP (the last one is auxiliary).  The tasks that have

PF_NOFREEZE unset (all user space processes and some kernel threads) are

PF_NOFREEZE unset (all user space processes and some kernel threads) are

regarded as 'freezable' and treated in a special way before the system enters a

regarded as 'freezable' and treated in a special way before the system enters a
@@ -17,30 +17,31 @@ suspend state as well as before a hibernation image is created (in what follows 
we only consider hibernation, but the description also applies to suspend).

we only consider hibernation, but the description also applies to suspend).





Namely, as the first step of the hibernation procedure the function

Namely, as the first step of the hibernation procedure the function

freeze_processes() (defined in kernel/power/process.c) is called.  It executes

freeze_processes() (defined in kernel/power/process.c) is called.  A system-wide

try_to_freeze_tasks() that sets TIF_FREEZE for all of the freezable tasks and

variable system_freezing_cnt (as opposed to a per-task flag) is used to indicate

either wakes them up, if they are kernel threads, or sends fake signals to them,

whether the system is to undergo a freezing operation. And freeze_processes()

if they are user space processes.  A task that has TIF_FREEZE set, should react

sets this variable.  After this, it executes try_to_freeze_tasks() that sends a

to it by calling the function called __refrigerator() (defined in

fake signal to all user space processes, and wakes up all the kernel threads.

kernel/freezer.c), which sets the task's PF_FROZEN flag, changes its state

All freezable tasks must react to that by calling try_to_freeze(), which

to TASK_UNINTERRUPTIBLE and makes it loop until PF_FROZEN is cleared for it.

results in a call to __refrigerator() (defined in kernel/freezer.c), which sets

Then, we say that the task is 'frozen' and therefore the set of functions

the task's PF_FROZEN flag, changes its state to TASK_UNINTERRUPTIBLE and makes

handling this mechanism is referred to as 'the freezer' (these functions are

it loop until PF_FROZEN is cleared for it. Then, we say that the task is

defined in kernel/power/process.c, kernel/freezer.c & include/linux/freezer.h).

'frozen' and therefore the set of functions handling this mechanism is referred

User space processes are generally frozen before kernel threads.

to as 'the freezer' (these functions are defined in kernel/power/process.c,

kernel/freezer.c & include/linux/freezer.h). User space processes are generally

frozen before kernel threads.





__refrigerator() must not be called directly.  Instead, use the

__refrigerator() must not be called directly.  Instead, use the

try_to_freeze() function (defined in include/linux/freezer.h), that checks

try_to_freeze() function (defined in include/linux/freezer.h), that checks

the task's TIF_FREEZE flag and makes the task enter __refrigerator() if the

if the task is to be frozen and makes the task enter __refrigerator().

flag is set.





For user space processes try_to_freeze() is called automatically from the

For user space processes try_to_freeze() is called automatically from the

signal-handling code, but the freezable kernel threads need to call it

signal-handling code, but the freezable kernel threads need to call it

explicitly in suitable places or use the wait_event_freezable() or

explicitly in suitable places or use the wait_event_freezable() or

wait_event_freezable_timeout() macros (defined in include/linux/freezer.h)

wait_event_freezable_timeout() macros (defined in include/linux/freezer.h)

that combine interruptible sleep with checking if TIF_FREEZE is set and calling

that combine interruptible sleep with checking if the task is to be frozen and

try_to_freeze().  The main loop of a freezable kernel thread may look like the

calling try_to_freeze().  The main loop of a freezable kernel thread may look

following one:

like the following one:





	set_freezable();

	set_freezable();

	do {

	do {
@@ -53,7 +54,7 @@ following one: 
(from drivers/usb/core/hub.c::hub_thread()).

(from drivers/usb/core/hub.c::hub_thread()).





If a freezable kernel thread fails to call try_to_freeze() after the freezer has

If a freezable kernel thread fails to call try_to_freeze() after the freezer has

set TIF_FREEZE for it, the freezing of tasks will fail and the entire

initiated a freezing operation, the freezing of tasks will fail and the entire

hibernation operation will be cancelled.  For this reason, freezable kernel

hibernation operation will be cancelled.  For this reason, freezable kernel

threads must call try_to_freeze() somewhere or use one of the

threads must call try_to_freeze() somewhere or use one of the

wait_event_freezable() and wait_event_freezable_timeout() macros.

wait_event_freezable() and wait_event_freezable_timeout() macros.

Documentation/security/keys.txt

+13 −1
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ KEY SERVICE OVERVIEW 




The key service provides a number of features besides keys:

The key service provides a number of features besides keys:





 (*) The key service defines two special key types:

 (*) The key service defines three special key types:





     (+) "keyring"

     (+) "keyring"
@@ -137,6 +137,18 @@ The key service provides a number of features besides keys: 
	 blobs of data. These can be created, updated and read by userspace,

	 blobs of data. These can be created, updated and read by userspace,

	 and aren't intended for use by kernel services.

	 and aren't intended for use by kernel services.





     (+) "logon"



	 Like a "user" key, a "logon" key has a payload that is an arbitrary

	 blob of data. It is intended as a place to store secrets which are

	 accessible to the kernel but not to userspace programs.



	 The description can be arbitrary, but must be prefixed with a non-zero

	 length string that describes the key "subclass". The subclass is

	 separated from the rest of the description by a ':'. "logon" keys can

	 be created and updated from userspace, but the payload is only

	 readable from kernel space.



 (*) Each process subscribes to three keyrings: a thread-specific keyring, a

 (*) Each process subscribes to three keyrings: a thread-specific keyring, a

     process-specific keyring, and a session-specific keyring.

     process-specific keyring, and a session-specific keyring.

MAINTAINERS

+3 −2
Original line number Original line Diff line number Diff line
@@ -3592,6 +3592,7 @@ S: Supported 
F:	drivers/net/wireless/iwlegacy/

F:	drivers/net/wireless/iwlegacy/





INTEL WIRELESS WIFI LINK (iwlwifi)

INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Johannes Berg <johannes.berg@intel.com>

M:	Wey-Yi Guy <wey-yi.w.guy@intel.com>

M:	Wey-Yi Guy <wey-yi.w.guy@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	linux-wireless@vger.kernel.org
@@ -7578,8 +7579,8 @@ F: Documentation/filesystems/xfs.txt 
F:	fs/xfs/

F:	fs/xfs/





XILINX AXI ETHERNET DRIVER

XILINX AXI ETHERNET DRIVER

M:	Ariane Keller <ariane.keller@tik.ee.ethz.ch>

M:	Anirudha Sarangi <anirudh@xilinx.com>

M:	Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>

M:	John Linn <John.Linn@xilinx.com>

S:	Maintained

S:	Maintained

F:	drivers/net/ethernet/xilinx/xilinx_axienet*

F:	drivers/net/ethernet/xilinx/xilinx_axienet*

Makefile

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

VERSION = 3

PATCHLEVEL = 4

PATCHLEVEL = 4

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Saber-toothed Squirrel

NAME = Saber-toothed Squirrel





# *DOCUMENTATION*

# *DOCUMENTATION*