Commit cd996fb4 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v4.13-rc7' into for-4.14/block-postmerge 



Linux 4.13-rc7

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parents e9a823fb cc4a41fe

Documentation/admin-guide/pm/cpufreq.rst

+8 −0
Original line number Original line 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

	This attribute is not present if the scaling driver in use does not

	support it.

	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``

``cpuinfo_max_freq``

	Maximum possible operating frequency the CPUs belonging to this policy

	Maximum possible operating frequency the CPUs belonging to this policy

	can run at (in kHz).

	can run at (in kHz).

Documentation/devicetree/bindings/ata/sata_rcar.txt

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

* Renesas R-Car SATA





Required properties:

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,sata-r8a7779" for R-Car H1

			    ("renesas,rcar-sata" is deprecated)

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

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

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

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

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

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

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

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

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

			  - "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;

- reg			: address and length of the SATA registers;

- interrupts		: must consist of one interrupt specifier.

- interrupts		: must consist of one interrupt specifier.

- clocks		: must contain a reference to the functional clock.

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

Example:





sata0: sata@ee300000 {

sata0: sata@ee300000 {

	compatible = "renesas,sata-r8a7791";

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

	reg = <0 0xee300000 0 0x2000>;

	reg = <0 0xee300000 0 0x2000>;

	interrupt-parent = <&gic>;

	interrupt-parent = <&gic>;

	interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

	interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/gpio/gpio-exar.txt

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
Exportable MPIO interface of Exar UART chips



Required properties of the device:

 - exar,first-pin: first exportable pins (0..15)

 - ngpios: number of exportable pins (1..16)

Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ Optional properties: 
Example for a Mali-T760:

Example for a Mali-T760:





gpu@ffa30000 {

gpu@ffa30000 {

	compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard";

	compatible = "rockchip,rk3288-mali", "arm,mali-t760";

	reg = <0xffa30000 0x10000>;

	reg = <0xffa30000 0x10000>;

	interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

	interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

		     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

		     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

Documentation/fb/efifb.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -27,5 +27,11 @@ You have to add the following kernel parameters in your elilo.conf: 
	Macbook Pro 17", iMac 20" :

	Macbook Pro 17", iMac 20" :

		video=efifb:i20

		video=efifb:i20





Accepted options:



nowc	Don't map the framebuffer write combined. This can be used

	to workaround side-effects and slowdowns on other CPU cores

	when large amounts of console data are written.



--

--

Edgar Hucek <gimli@dark-green.com>
 
Edgar Hucek <gimli@dark-green.com>