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

Commit ef426c10 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2016-12-30' of... 

Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc

 into drm-intel-next-queued

Directly merge drm-misc into drm-intel since Dave is on vacation and
we need the various drm-misc patches (fb format rework, drm mm fixes,
selftest framework and others). Also pulled back -rc2 in first to
resync with drm-intel-fixes and make sure I can reuse the exact rerere
solutions from drm-tip for safety, and because I'm lazy.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents a402eae6 9b8b75de

Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
THS8135 Video DAC

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



This is the binding for Texas Instruments THS8135 Video DAC bridge.



Required properties:



- compatible: Must be "ti,ths8135"



Required nodes:



This device has two video ports. Their connections are modelled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for RGB input

- Video port 1 for VGA output



Example

-------



vga-bridge {

	compatible = "ti,ths8135";

	#address-cells = <1>;

	#size-cells = <0>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;



			vga_bridge_in: endpoint {

				remote-endpoint = <&lcdc_out_vga>;

			};

		};



		port@1 {

			reg = <1>;



			vga_bridge_out: endpoint {

				remote-endpoint = <&vga_con_in>;

			};

		};

	};

};

Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ Required properties: 
  "clk_ade_core" for the ADE core clock.

  "clk_codec_jpeg" for the media NOC QoS clock, which use the same clock with

  jpeg codec.

  "clk_ade_pix" for the ADE pixel clok.

  "clk_ade_pix" for the ADE pixel clock.

- assigned-clocks: Should contain "clk_ade_core" and "clk_codec_jpeg" clocks'

  phandle + clock-specifier pairs.

- assigned-clock-rates: clock rates, one for each entry in assigned-clocks.

Documentation/dma-buf-sharing.txt

deleted100644 → 0
+0 −482

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/driver-api/dma-buf.rst

+92 −0

File changed.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3965,7 +3965,7 @@ F: drivers/dma-buf/ 
F:	include/linux/dma-buf*

F:	include/linux/reservation.h

F:	include/linux/*fence.h

F:	Documentation/dma-buf-sharing.txt

F:	Documentation/driver-api/dma-buf.rst

T:	git git://anongit.freedesktop.org/drm/drm-misc



SYNC FILE FRAMEWORK