Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml gpu.xml media_api.xml w1.xml \

	    tracepoint.xml media_api.xml w1.xml \

	    writing_musb_glue_layer.xml crypto-API.xml iio.xml

include Documentation/DocBook/media/Makefile

ARM Mali-DP

The following bindings apply to a family of Display Processors sold as

licensable IP by ARM Ltd. The bindings describe the Mali DP500, DP550 and

DP650 processors that offer multiple composition layers, support for

rotation and scaling output.

Required properties:

  - compatible: should be one of

	"arm,mali-dp500"

	"arm,mali-dp550"

	"arm,mali-dp650"

    depending on the particular implementation present in the hardware

  - reg: Physical base address and size of the block of registers used by

    the processor.

  - interrupts: Interrupt list, as defined in ../interrupt-controller/interrupts.txt,

    interrupt client nodes.

  - interrupt-names: name of the engine inside the processor that will

    use the corresponding interrupt. Should be one of "DE" or "SE".

  - clocks: A list of phandle + clock-specifier pairs, one for each entry

    in 'clock-names'

  - clock-names: A list of clock names. It should contain:

      - "pclk": for the APB interface clock

      - "aclk": for the AXI interface clock

      - "mclk": for the main processor clock

      - "pxlclk": for the pixel clock feeding the output PLL of the processor.

  - arm,malidp-output-port-lines: Array of u8 values describing the number

    of output lines per channel (R, G and B).

Required sub-nodes:

  - port: The Mali DP connection to an encoder input port. The connection

    is modelled using the OF graph bindings specified in

    Documentation/devicetree/bindings/graph.txt

Optional properties:

  - memory-region: phandle to a node describing memory (see

    Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt)

    to be used for the framebuffer; if not present, the framebuffer may

    be located anywhere in memory.

Example:

/ {

	...

	dp0: malidp@6f200000 {

		compatible = "arm,mali-dp650";

		reg = <0 0x6f200000 0 0x20000>;

		memory-region = <&display_reserved>;

		interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>,

			     <0 168 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "DE", "SE";

		clocks = <&oscclk2>, <&fpgaosc0>, <&fpgaosc1>, <&fpgaosc1>;

		clock-names = "pxlclk", "mclk", "aclk", "pclk";

		arm,malidp-output-port-lines = /bits/ 8 <8 8 8>;

		port {

			dp0_output: endpoint {

				remote-endpoint = <&tda998x_2_input>;

			};

		};

	};

	...

};

sii902x HDMI bridge bindings

Required properties:

	- compatible: "sil,sii9022"

	- reg: i2c address of the bridge

Optional properties:

	- interrupts-extended or interrupt-parent + interrupts: describe

	  the interrupt line used to inform the host about hotplug events.

	- reset-gpios: OF device-tree gpio specification for RST_N pin.

Optional subnodes:

	- video input: this subnode can contain a video input port node

	  to connect the bridge to a display controller output (See this

	  documentation [1]).

[1]: Documentation/devicetree/bindings/media/video-interfaces.txt

Example:

	hdmi-bridge@39 {

		compatible = "sil,sii9022";

		reg = <0x39>;

		reset-gpios = <&pioA 1 0>;

		ports {

			#address-cells = <1>;

			#size-cells = <0>;

			port@0 {

				reg = <0>;

				bridge_in: endpoint {

					remote-endpoint = <&dc_out>;

				};

			};

		};

	};

Optional properties:

- label: a symbolic name for the connector

- hpd-gpios: HPD GPIO number

- ddc-i2c-bus: phandle link to the I2C controller used for DDC EDID probing

Required nodes:

- Video port for HDMI input