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

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

Merge drm-upstream/drm-next into drm-intel-next-queued 



Catch up with upstream while it's easy.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents afe722be 7846b12f

Documentation/admin-guide/pm/cpufreq.rst

+8 −0
Original line number Diff line number Diff line
@@ -237,6 +237,14 @@ are the following: 
	This attribute is not present if the scaling driver in use does not

	support it.



``cpuinfo_cur_freq``

	Current frequency of the CPUs belonging to this policy as obtained from

	the hardware (in KHz).



	This is expected to be the frequency the hardware actually runs at.

	If that frequency cannot be determined, this attribute should not

	be present.



``cpuinfo_max_freq``

	Maximum possible operating frequency the CPUs belonging to this policy

	can run at (in kHz).

Documentation/device-mapper/dm-raid.txt

+1 −0
Original line number Diff line number Diff line
@@ -343,3 +343,4 @@ Version History 
1.11.0  Fix table line argument order

	(wrong raid10_copies/raid10_format sequence)

1.11.1  Add raid4/5/6 journal write-back support via journal_mode option

1.12.1  fix for MD deadlock between mddev_suspend() and md_write_start() available

Documentation/devicetree/bindings/ata/sata_rcar.txt

+11 −3
Original line number Diff line number Diff line 
* Renesas R-Car SATA



Required properties:

- compatible		: should contain one of the following:

- compatible		: should contain one or more of the following:

			  - "renesas,sata-r8a7779" for R-Car H1

			    ("renesas,rcar-sata" is deprecated)

			  - "renesas,sata-r8a7790-es1" for R-Car H2 ES1

			  - "renesas,sata-r8a7790" for R-Car H2 other than ES1

			  - "renesas,sata-r8a7791" for R-Car M2-W

			  - "renesas,sata-r8a7793" for R-Car M2-N

			  - "renesas,sata-r8a7795" for R-Car H3

			  - "renesas,rcar-gen2-sata" for a generic R-Car Gen2 compatible device

			  - "renesas,rcar-gen3-sata" for a generic R-Car Gen3 compatible device

			  - "renesas,rcar-sata" is deprecated



			  When compatible with the generic version nodes

			  must list the SoC-specific version corresponding

			  to the platform first followed by the generic

			  version.



- reg			: address and length of the SATA registers;

- interrupts		: must consist of one interrupt specifier.

- clocks		: must contain a reference to the functional clock.
@@ -16,7 +24,7 @@ Required properties: 
Example:



sata0: sata@ee300000 {

	compatible = "renesas,sata-r8a7791";

	compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";

	reg = <0 0xee300000 0 0x2000>;

	interrupt-parent = <&gic>;

	interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ Required properties: 


Optional properties:

- clocks: Reference to the crypto engine clock.

- dma-mask: The address mask limitation. Defaults to 64.



Example:
@@ -24,6 +23,5 @@ Example: 
		interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3",

				  "eip";

		clocks = <&cpm_syscon0 1 26>;

		dma-mask = <0xff 0xffffffff>;

		status = "disabled";

	};

Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt

+0 −12
Original line number Diff line number Diff line
@@ -25,12 +25,6 @@ Required properties: 
	 size-cells must 1 and 0, respectively.

- port: contains an endpoint node which is connected to the endpoint in the mic

	node. The reg value muset be 0.

- i80-if-timings: specify whether the panel which is connected to decon uses

		  i80 lcd interface or mipi video interface. This node contains

		  no timing information as that of fimd does. Because there is

		  no register in decon to specify i80 interface timing value,

		  it is not needed, but make it remain to use same kind of node

		  in fimd and exynos7 decon.



Example:

SoC specific DT entry:
@@ -59,9 +53,3 @@ decon: decon@13800000 { 
		};

	};

};
 


Board specific DT entry:

&decon {

	i80-if-timings {

	};

};