Merge branch 'topic/of-graph' of git://git.pengutronix.de/git/pza/linux into imx-drm-staging

* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX

Required properties:

- compatible : Should be "fsl,imx31-sdma", "fsl,imx31-to1-sdma",

  "fsl,imx31-to2-sdma", "fsl,imx35-sdma", "fsl,imx35-to1-sdma",

  "fsl,imx35-to2-sdma", "fsl,imx51-sdma", "fsl,imx53-sdma" or

  "fsl,imx6q-sdma". The -to variants should be preferred since they

  allow to determnine the correct ROM script addresses needed for

  the driver to work without additional firmware.

- compatible : Should be one of

      "fsl,imx25-sdma"

      "fsl,imx31-sdma", "fsl,imx31-to1-sdma", "fsl,imx31-to2-sdma"

      "fsl,imx35-sdma", "fsl,imx35-to1-sdma", "fsl,imx35-to2-sdma"

      "fsl,imx51-sdma"

      "fsl,imx53-sdma"

      "fsl,imx6q-sdma"

  The -to variants should be preferred since they allow to determnine the

  correct ROM script addresses needed for the driver to work without additional

  firmware.

- reg : Should contain SDMA registers location and length

- interrupts : Should contain SDMA interrupt

- #dma-cells : Must be <3>.

Common bindings for device graphs

General concept

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

The hierarchical organisation of the device tree is well suited to describe

control flow to devices, but there can be more complex connections between

devices that work together to form a logical compound device, following an

arbitrarily complex graph.

There already is a simple directed graph between devices tree nodes using

phandle properties pointing to other nodes to describe connections that

can not be inferred from device tree parent-child relationships. The device

tree graph bindings described herein abstract more complex devices that can

have multiple specifiable ports, each of which can be linked to one or more

ports of other devices.

These common bindings do not contain any information about the direction or

type of the connections, they just map their existence. Specific properties

may be described by specialized bindings depending on the type of connection.

To see how this binding applies to video pipelines, for example, see

Documentation/device-tree/bindings/media/video-interfaces.txt.

Here the ports describe data interfaces, and the links between them are

the connecting data buses. A single port with multiple connections can

correspond to multiple devices being connected to the same physical bus.

Organisation of ports and endpoints

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

Ports are described by child 'port' nodes contained in the device node.

Each port node contains an 'endpoint' subnode for each remote device port

connected to this port. If a single port is connected to more than one

remote device, an 'endpoint' child node must be provided for each link.

If more than one port is present in a device node or there is more than one

endpoint at a port, or a port node needs to be associated with a selected

hardware interface, a common scheme using '#address-cells', '#size-cells'

and 'reg' properties is used number the nodes.

device {

        ...

        #address-cells = <1>;

        #size-cells = <0>;

        port@0 {

	        #address-cells = <1>;

	        #size-cells = <0>;

		reg = <0>;

                endpoint@0 {

			reg = <0>;

			...

		};

                endpoint@1 {

			reg = <1>;

			...

		};

        };

        port@1 {

		reg = <1>;

		endpoint { ... };

	};

};

All 'port' nodes can be grouped under an optional 'ports' node, which

allows to specify #address-cells, #size-cells properties for the 'port'

nodes independently from any other child device nodes a device might

have.

device {

        ...

        ports {

                #address-cells = <1>;

                #size-cells = <0>;

                port@0 {

                        ...

                        endpoint@0 { ... };

                        endpoint@1 { ... };

                };

                port@1 { ... };

        };

};

Links between endpoints

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

Each endpoint should contain a 'remote-endpoint' phandle property that points

to the corresponding endpoint in the port of the remote device. In turn, the

remote endpoint should contain a 'remote-endpoint' property. If it has one,

it must not point to another than the local endpoint. Two endpoints with their

'remote-endpoint' phandles pointing at each other form a link between the

containing ports.

device-1 {

        port {

                device_1_output: endpoint {

                        remote-endpoint = <&device_2_input>;

                };

        };

};

device-2 {

        port {

                device_2_input: endpoint {

                        remote-endpoint = <&device_1_output>;

                };

        };

};

Required properties

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

If there is more than one 'port' or more than one 'endpoint' node or 'reg'

property is present in port and/or endpoint nodes the following properties

are required in a relevant parent node:

 - #address-cells : number of cells required to define port/endpoint

                    identifier, should be 1.

 - #size-cells    : should be zero.

Optional endpoint properties

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

- remote-endpoint: phandle to an 'endpoint' subnode of a remote device node.

ALTERA UART/JTAG UART SERIAL DRIVERS

M:	Tobias Klauser <tklauser@distanz.ch>

L:	linux-serial@vger.kernel.org

L:	nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers)

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/tty/serial/altera_uart.c

F:	drivers/tty/serial/altera_jtaguart.c

M:	Oliver Neukum <oliver@neukum.org>

M:	Ali Akcaagac <aliakc@web.de>

M:	Jamie Lenehan <lenehan@twibble.org>

W:	http://twibble.org/dist/dc395x/

L:	dc395x@twibble.org

L:	http://lists.twibble.org/mailman/listinfo/dc395x/

W:	http://twibble.org/dist/dc395x/

W:	http://lists.twibble.org/mailman/listinfo/dc395x/

S:	Maintained

F:	Documentation/scsi/dc395x.txt

F:	drivers/scsi/dc395x.*

DRM DRIVERS

M:	David Airlie <airlied@linux.ie>

L:	dri-devel@lists.freedesktop.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git

T:	git git://people.freedesktop.org/~airlied/linux

S:	Maintained

F:	drivers/gpu/drm/

F:	include/drm/

F:	include/uapi/drm/

RADEON DRM DRIVERS

M:	Alex Deucher <alexander.deucher@amd.com>

M:	Christian König <christian.koenig@amd.com>

L:	dri-devel@lists.freedesktop.org

T:	git git://people.freedesktop.org/~agd5f/linux

S:	Supported

F:	drivers/gpu/drm/radeon/

F:	include/drm/radeon*

F:	include/uapi/drm/radeon*

INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Daniel Vetter <daniel.vetter@ffwll.ch>

M:	Jani Nikula <jani.nikula@linux.intel.com>

L:	linux-man@vger.kernel.org

S:	Maintained

MARVELL ARMADA DRM SUPPORT

M:	Russell King <rmk+kernel@arm.linux.org.uk>

S:	Maintained

F:	drivers/gpu/drm/armada/

MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)

M:	Mirko Lindner <mlindner@marvell.com>

M:	Stephen Hemminger <stephen@networkplumber.org>

M:	Nicholas A. Bellinger <nab@linux-iscsi.org>

L:	linux-scsi@vger.kernel.org

L:	target-devel@vger.kernel.org

L:	http://groups.google.com/group/linux-iscsi-target-dev

W:	http://www.linux-iscsi.org

W:	http://groups.google.com/group/linux-iscsi-target-dev

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master

S:	Supported

F:	drivers/target/

VERSION = 3

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Shuffling Zombie Juror

# *DOCUMENTATION*

ifdef CONFIG_CC_STACKPROTECTOR_REGULAR

  stackp-flag := -fstack-protector

  ifeq ($(call cc-option, $(stackp-flag)),)

    $(warning Cannot use CONFIG_CC_STACKPROTECTOR: \

	      -fstack-protector not supported by compiler))

    $(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \

             -fstack-protector not supported by compiler)

  endif

else ifdef CONFIG_CC_STACKPROTECTOR_STRONG

else

ifdef CONFIG_CC_STACKPROTECTOR_STRONG

  stackp-flag := -fstack-protector-strong

  ifeq ($(call cc-option, $(stackp-flag)),)

    $(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \

  # Force off for distro compilers that enable stack protector by default.

  stackp-flag := $(call cc-option, -fno-stack-protector)

endif

endif

KBUILD_CFLAGS += $(stackp-flag)

# This warning generated too much noise in a regular build.

				    unsigned long cmd,

				    void *v)

{

	if (cmd == CPU_PM_EXIT) {

	if (cmd == CPU_PM_EXIT &&

	    __hyp_get_vectors() == hyp_default_vectors) {

		cpu_init_hyp_mode(NULL);

		return NOTIFY_OK;

	}