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

Commit ccb6662b authored by Jani Nikula's avatar Jani Nikula
Browse files

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



Backmerge drm-next so I can apply Maarten's drm/i915 atomic conversion
patches.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents 2441f877 63e14561

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ Description: Discover CPUs in the same CPU frequency coordination domain 
What:		/sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1}

Date:		August 2008

KernelVersion:	2.6.27

Contact:	discuss@x86-64.org

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Disable L3 cache indices



		These files exist in every CPU's cache/index3 directory. Each

Documentation/DocBook/drm.tmpl

+12 −0
Original line number Diff line number Diff line
@@ -2439,6 +2439,18 @@ void intel_crt_init(struct drm_device *dev) 
	  <title>Tile group</title>

!Pdrivers/gpu/drm/drm_crtc.c Tile group

    </sect2>

    <sect2>

	<title>Bridges</title>

      <sect3>

	 <title>Overview</title>

!Pdrivers/gpu/drm/drm_bridge.c overview

      </sect3>

      <sect3>

	 <title>Default bridge callback sequence</title>

!Pdrivers/gpu/drm/drm_bridge.c bridge callbacks

      </sect3>

!Edrivers/gpu/drm/drm_bridge.c

    </sect2>

  </sect1>



  <!-- Internals: kms properties -->

Documentation/devicetree/bindings/clock/silabs,si5351.txt

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Required properties: 
- #clock-cells: from common clock binding; shall be set to 1.

- clocks: from common clock binding; list of parent clock

  handles, shall be xtal reference clock or xtal and clkin for

  si5351c only.

  si5351c only. Corresponding clock input names are "xtal" and

  "clkin" respectively.

- #address-cells: shall be set to 1.

- #size-cells: shall be set to 0.
@@ -71,6 +72,7 @@ i2c-master-node { 


		/* connect xtal input to 25MHz reference */

		clocks = <&ref25>;

		clock-names = "xtal";



		/* connect xtal input as source of pll0 and pll1 */

		silabs,pll-source = <0 0>, <1 0>;

Documentation/devicetree/bindings/drm/tilcdc/slave.txt

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
Device-Tree bindings for tilcdc DRM encoder slave output driver



Required properties:

 - compatible: value should be "ti,tilcdc,slave".

 - i2c: the phandle for the i2c device the encoder slave is connected to



Recommended properties:

 - pinctrl-names, pinctrl-0: the pincontrol settings to configure

   muxing properly for pins that connect to TFP410 device



Example:



	hdmi {

		compatible = "ti,tilcdc,slave";

		i2c = <&i2c0>;

		pinctrl-names = "default";

		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;

	};

Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt

+27 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ Optional properties: 
 - max-pixelclock: The maximum pixel clock that can be supported

   by the lcd controller in KHz.



Optional nodes:



 - port/ports: to describe a connection to an external encoder. The

   binding follows Documentation/devicetree/bindings/graph.txt and

   suppors a single port with a single endpoint.



Example:



	fb: fb@4830e000 {
@@ -26,4 +32,25 @@ Example: 
		interrupt-parent = <&intc>;

		interrupts = <36>;

		ti,hwmods = "lcdc";



		port {

			lcdc_0: endpoint@0 {

				remote-endpoint = <&hdmi_0>;

			};

		};

	};



	tda19988: tda19988 {

		compatible = "nxp,tda998x";

		reg = <0x70>;



		pinctrl-names = "default", "off";

		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;

		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;



		port {

			hdmi_0: endpoint@0 {

				remote-endpoint = <&lcdc_0>;

			};

		};

	};