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

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

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

parents 7b22a778 9c982e86

Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys": 
Required subnode-properties:

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- channel: Channel this key is attached to, mut be 0 or 1.

	- channel: Channel this key is attached to, must be 0 or 1.

	- voltage: Voltage in µV at lradc input when this key is pressed.



Example:

Documentation/devicetree/bindings/mtd/partition.txt

+6 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ used for what purposes, but which don't use an on-flash partition table such 
as RedBoot.



The partition table should be a subnode of the mtd node and should be named

'partitions'. Partitions are defined in subnodes of the partitions node.

'partitions'. This node should have the following property:

- compatible : (required) must be "fixed-partitions"

Partitions are then defined in subnodes of the partitions node.



For backwards compatibility partitions as direct subnodes of the mtd device are

supported. This use is discouraged.
@@ -36,6 +38,7 @@ Examples: 


flash@0 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;
@@ -53,6 +56,7 @@ flash@0 { 


flash@1 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <2>;
@@ -66,6 +70,7 @@ flash@1 { 


flash@2 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <2>;

		#size-cells = <2>;

Documentation/devicetree/bindings/net/cpsw.txt

+3 −3
Original line number Diff line number Diff line
@@ -40,18 +40,18 @@ Optional properties: 


Slave Properties:

Required properties:

- phy_id		: Specifies slave phy id

- phy-mode		: See ethernet.txt file in the same directory



Optional properties:

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- mac-address		: See ethernet.txt file in the same directory

- phy_id		: Specifies slave phy id

- phy-handle		: See ethernet.txt file in the same directory



Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the properties phy_id and phy-mode,

			  or the sub-node fixed-link can be specified

			  Either the property phy_id, or the sub-node

			  fixed-link can be specified



Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -8403,6 +8403,14 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) 
S:	Maintained

F:	drivers/pinctrl/samsung/



PIN CONTROLLER - SINGLE

M:	Tony Lindgren <tony@atomide.com>

M:	Haojian Zhuang <haojian.zhuang@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/pinctrl/pinctrl-single.c



PIN CONTROLLER - ST SPEAR

M:	Viresh Kumar <vireshk@kernel.org>

L:	spear-devel@list.st.com

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc7

NAME = Blurry Fish Butt



# *DOCUMENTATION*