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

Merge 4.0-rc5 into tty-next 



We want the tty/serial fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 48d7ff0e bc465aa9

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Optional Properties: 
	- pclkN, clkN: Pairs of parent of input clock and input clock to the

		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		are supported currently.

- power-domains: phandle pointing to the parent power domain, for more details

		 see Documentation/devicetree/bindings/power/power_domain.txt



Node of a device using power domains must have a power-domains property

defined with a phandle to respective power domain.

Documentation/devicetree/bindings/arm/sti.txt

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ Boards with the ST STiH407 SoC shall have the following properties: 
Required root node property:

compatible = "st,stih407";



Boards with the ST STiH410 SoC shall have the following properties:

Required root node property:

compatible = "st,stih410";



Boards with the ST STiH418 SoC shall have the following properties:

Required root node property:

compatible = "st,stih418";

Documentation/devicetree/bindings/net/apm-xgene-enet.txt

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ Ethernet nodes are defined to describe on-chip ethernet interfaces in 
APM X-Gene SoC.



Required properties for all the ethernet interfaces:

- compatible: Should be "apm,xgene-enet"

- compatible: Should state binding information from the following list,

  - "apm,xgene-enet":    RGMII based 1G interface

  - "apm,xgene1-sgenet": SGMII based 1G interface

  - "apm,xgene1-xgenet": XFI based 10G interface

- reg: Address and length of the register set for the device. It contains the

  information of registers in the same order as described by reg-names

- reg-names: Should contain the register set names

Documentation/devicetree/bindings/power/power_domain.txt

+29 −0
Original line number Diff line number Diff line
@@ -19,6 +19,16 @@ Required properties: 
   providing multiple PM domains (e.g. power controllers), but can be any value

   as specified by device tree binding documentation of particular provider.



Optional properties:

 - power-domains : A phandle and PM domain specifier as defined by bindings of

                   the power controller specified by phandle.

   Some power domains might be powered from another power domain (or have

   other hardware specific dependencies). For representing such dependency

   a standard PM domain consumer binding is used. When provided, all domains

   created by the given provider should be subdomains of the domain

   specified by this binding. More details about power domain specifier are

   available in the next section.



Example:



	power: power-controller@12340000 {
@@ -30,6 +40,25 @@ Example: 
The node above defines a power controller that is a PM domain provider and

expects one cell as its phandle argument.



Example 2:



	parent: power-controller@12340000 {

		compatible = "foo,power-controller";

		reg = <0x12340000 0x1000>;

		#power-domain-cells = <1>;

	};



	child: power-controller@12340000 {

		compatible = "foo,power-controller";

		reg = <0x12341000 0x1000>;

		power-domains = <&parent 0>;

		#power-domain-cells = <1>;

	};



The nodes above define two power controllers: 'parent' and 'child'.

Domains created by the 'child' power controller are subdomains of '0' power

domain provided by the 'parent' power controller.



==PM domain consumers==



Required properties: