Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux (731c7d3a) · Commits · e / devices / android_kernel_teracube_2e

Documentation/DocBook/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@ DOCBOOKS := z8530book.xml device-drivers.xml \
	genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \		genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
	80211.xml debugobjects.xml sh.xml regulator.xml \		80211.xml debugobjects.xml sh.xml regulator.xml \
	alsa-driver-api.xml writing-an-alsa-driver.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		writing_musb_glue_layer.xml crypto-API.xml iio.xml

	include Documentation/DocBook/media/Makefile		include Documentation/DocBook/media/Makefile

Documentation/DocBook/device-drivers.tmpl

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -161,6 +161,10 @@ X!Edrivers/base/interface.c
	!Iinclude/linux/fence.h		!Iinclude/linux/fence.h
	!Edrivers/dma-buf/seqno-fence.c		!Edrivers/dma-buf/seqno-fence.c
	!Iinclude/linux/seqno-fence.h		!Iinclude/linux/seqno-fence.h
			!Edrivers/dma-buf/fence-array.c
			!Iinclude/linux/fence-array.h
			!Edrivers/dma-buf/reservation.c
			!Iinclude/linux/reservation.h
	!Edrivers/dma-buf/sync_file.c		!Edrivers/dma-buf/sync_file.c
	!Iinclude/linux/sync_file.h		!Iinclude/linux/sync_file.h
	</sect2>		</sect2>

Documentation/DocBook/gpu.tmpl

deleted100644 → 0

+0 −3540

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/display/arm,malidp.txt

0 → 100644

+65 −0

Original line number	Original line	Diff line number	Diff line
			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>;
			};
			};
			};

			...
			};

Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt

+21 −5

Original line number	Original line	Diff line number	Diff line
	Analog Device ADV7511(W)/13 HDMI Encoders		Analog Device ADV7511(W)/13/33 HDMI Encoders
	-----------------------------------------		-----------------------------------------

	The ADV7511, ADV7511W and ADV7513 are HDMI audio and video transmitters		The ADV7511, ADV7511W, ADV7513 and ADV7533 are HDMI audio and video transmitters
	compatible with HDMI 1.4 and DVI 1.0. They support color space conversion,		compatible with HDMI 1.4 and DVI 1.0. They support color space conversion,
	S/PDIF, CEC and HDCP.		S/PDIF, CEC and HDCP. ADV7533 supports the DSI interface for input pixels, while
			the others support RGB interface.

	Required properties:		Required properties:

	- compatible: Should be one of "adi,adv7511", "adi,adv7511w" or "adi,adv7513"		- compatible: Should be one of:
			"adi,adv7511"
			"adi,adv7511w"
			"adi,adv7513"
			"adi,adv7533"

	- reg: I2C slave address		- reg: I2C slave address

	The ADV7511 supports a large number of input data formats that differ by their		The ADV7511 supports a large number of input data formats that differ by their
	@@ -32,6 +38,11 @@ The following input format properties are required except in "rgb 1x" and
	- adi,input-justification: The input bit justification ("left", "evenly",		- adi,input-justification: The input bit justification ("left", "evenly",
	"right").		"right").

			The following properties are required for ADV7533:

			- adi,dsi-lanes: Number of DSI data lanes connected to the DSI host. It should
			be one of 1, 2, 3 or 4.

	Optional properties:		Optional properties:

	- interrupts: Specifier for the ADV7511 interrupt		- interrupts: Specifier for the ADV7511 interrupt
	@@ -42,13 +53,18 @@ Optional properties:
	- adi,embedded-sync: The input uses synchronization signals embedded in the		- adi,embedded-sync: The input uses synchronization signals embedded in the
	data stream (similar to BT.656). Defaults to separate H/V synchronization		data stream (similar to BT.656). Defaults to separate H/V synchronization
	signals.		signals.
			- adi,disable-timing-generator: Only for ADV7533. Disables the internal timing
			generator. The chip will rely on the sync signals in the DSI data lanes,
			rather than generate its own timings for HDMI output.

	Required nodes:		Required nodes:

	The ADV7511 has two video ports. Their connections are modelled using the OF		The ADV7511 has two video ports. Their connections are modelled using the OF
	graph bindings specified in Documentation/devicetree/bindings/graph.txt.		graph bindings specified in Documentation/devicetree/bindings/graph.txt.

	- Video port 0 for the RGB or YUV input		- Video port 0 for the RGB, YUV or DSI input. In the case of ADV7533, the
			remote endpoint phandle should be a reference to a valid mipi_dsi_host device
			node.
	- Video port 1 for the HDMI output		- Video port 1 for the HDMI output