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

Commit c21b04f9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.5-rc4 into driver-core-next 



We want the fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 28c09ec4 18558cae

Documentation/cgroup-v2.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and 
conventions of cgroup v2.  It describes all userland-visible aspects

conventions of cgroup v2.  It describes all userland-visible aspects

of cgroup including core and specific controller behaviors.  All

of cgroup including core and specific controller behaviors.  All

future changes must be reflected in this document.  Documentation for

future changes must be reflected in this document.  Documentation for

v1 is available under Documentation/cgroup-legacy/.

v1 is available under Documentation/cgroup-v1/.





CONTENTS

CONTENTS

Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ OHCI and EHCI controllers. 
Required properties:

Required properties:

- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;

- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;

	      "renesas,pci-r8a7791" for the R8A7791 SoC;

	      "renesas,pci-r8a7791" for the R8A7791 SoC;

	      "renesas,pci-r8a7793" for the R8A7793 SoC;

	      "renesas,pci-r8a7794" for the R8A7794 SoC;

	      "renesas,pci-r8a7794" for the R8A7794 SoC;

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

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

Documentation/devicetree/bindings/pci/rcar-pci.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;

compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;

	    "renesas,pcie-r8a7790" for the R8A7790 SoC;

	    "renesas,pcie-r8a7790" for the R8A7790 SoC;

	    "renesas,pcie-r8a7791" for the R8A7791 SoC;

	    "renesas,pcie-r8a7791" for the R8A7791 SoC;

	    "renesas,pcie-r8a7793" for the R8A7793 SoC;

	    "renesas,pcie-r8a7795" for the R8A7795 SoC;

	    "renesas,pcie-r8a7795" for the R8A7795 SoC;

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

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

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ The compatible list for this generic sound card currently: 
 "fsl,imx-audio-sgtl5000"

 "fsl,imx-audio-sgtl5000"

 (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)

 (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)





 "fsl,imx-audio-wm8960"



Required properties:

Required properties:





  - compatible		: Contains one of entries in the compatible list.

  - compatible		: Contains one of entries in the compatible list.

Documentation/devicetree/bindings/thermal/rcar-thermal.txt

+35 −2
Original line number Original line Diff line number Diff line 
* Renesas R-Car Thermal

* Renesas R-Car Thermal





Required properties:

Required properties:

- compatible		: "renesas,thermal-<soctype>", "renesas,rcar-thermal"

- compatible		: "renesas,thermal-<soctype>",

			  as fallback.

			   "renesas,rcar-gen2-thermal" (with thermal-zone) or

			   "renesas,rcar-thermal" (without thermal-zone) as fallback.

			  Examples with soctypes are:

			  Examples with soctypes are:

			    - "renesas,thermal-r8a73a4" (R-Mobile APE6)

			    - "renesas,thermal-r8a73a4" (R-Mobile APE6)

			    - "renesas,thermal-r8a7779" (R-Car H1)

			    - "renesas,thermal-r8a7779" (R-Car H1)
@@ -36,3 +37,35 @@ thermal@e61f0000 { 
		0xe61f0300 0x38>;

		0xe61f0300 0x38>;

	interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;

	interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;

};

};



Example (with thermal-zone):



thermal-zones {

	cpu_thermal: cpu-thermal {

		polling-delay-passive	= <1000>;

		polling-delay		= <5000>;



		thermal-sensors = <&thermal>;



		trips {

			cpu-crit {

				temperature	= <115000>;

				hysteresis	= <0>;

				type		= "critical";

			};

		};

		cooling-maps {

		};

	};

};



thermal: thermal@e61f0000 {

	compatible =	"renesas,thermal-r8a7790",

			"renesas,rcar-gen2-thermal",

			"renesas,rcar-thermal";

	reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;

	interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&mstp5_clks R8A7790_CLK_THERMAL>;

	power-domains = <&cpg_clocks>;

	#thermal-sensor-cells = <0>;

};