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

Commit 0fa74a4b authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	net/core/sysctl_net_core.c
	net/ipv4/inet_diag.c

The be_main.c conflict resolution was really tricky.  The conflict
hunks generated by GIT were very unhelpful, to say the least.  It
split functions in half and moved them around, when the real actual
conflict only existed solely inside of one function, that being
be_map_pci_bars().

So instead, to resolve this, I checked out be_main.c from the top
of net-next, then I applied the be_main.c changes from 'net' since
the last time I merged.  And this worked beautifully.

The inet_diag.c and sysctl_net_core.c conflicts were simple
overlapping changes, and were easily to resolve.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6626af69 4de930ef

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

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

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

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

		are supported currently.

		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

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

defined with a phandle to respective power domain.

defined with a phandle to respective power domain.

Documentation/devicetree/bindings/arm/sti.txt

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

Required root node property:

compatible = "st,stih407";

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:

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

Required root node property:

Required root node property:

compatible = "st,stih418";

compatible = "st,stih418";

Documentation/devicetree/bindings/power/power_domain.txt

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

   providing multiple PM domains (e.g. power controllers), but can be any value

   as specified by device tree binding documentation of particular provider.

   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:

Example:





	power: power-controller@12340000 {

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

The node above defines a power controller that is a PM domain provider and

expects one cell as its phandle argument.

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

==PM domain consumers==





Required properties:

Required properties:

Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt

0 → 100644
+19 −0
Original line number Original line Diff line number Diff line 
ETRAX FS UART



Required properties:

- compatible : "axis,etraxfs-uart"

- reg: offset and length of the register set for the device.

- interrupts: device interrupt



Optional properties:

- {dtr,dsr,ri,cd}-gpios: specify a GPIO for DTR/DSR/RI/CD

  line respectively.



Example:



serial@b00260000 {

	compatible = "axis,etraxfs-uart";

	reg = <0xb0026000 0x1000>;

	interrupts = <68>;

	status = "disabled";

};