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

Commit 638d3c63 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:
	net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 74fe61f1 f760b87f

Documentation/arm/sunxi/README

+17 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf



      - Allwinner A23

      - Allwinner A23 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf

        + User Manual
@@ -55,7 +55,23 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf



      - Allwinner A33 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf

        + User Manual

          http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf



      - Allwinner H3 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf



    * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs

      - Allwinner A80

        + Datasheet

	  http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf



    * Octa ARM Cortex-A7 based SoCs

      - Allwinner A83T

        + Not Supported

        + Datasheet

          http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf

Documentation/devicetree/bindings/arm/sunxi.txt

+2 −0
Original line number Diff line number Diff line
@@ -9,4 +9,6 @@ using one of the following compatible strings: 
  allwinner,sun6i-a31

  allwinner,sun7i-a20

  allwinner,sun8i-a23

  allwinner,sun8i-a33

  allwinner,sun8i-h3

  allwinner,sun9i-a80

Documentation/devicetree/bindings/hwlock/hwlock.txt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
Generic hwlock bindings

=======================



Generic bindings that are common to all the hwlock platform specific driver

implementations.



Please also look through the individual platform specific hwlock binding

documentations for identifying any additional properties specific to that

platform.



hwlock providers:

=================



Required properties:

- #hwlock-cells:        Specifies the number of cells needed to represent a

                        specific lock.



hwlock users:

=============



Consumers that require specific hwlock(s) should specify them using the

property "hwlocks", and an optional "hwlock-names" property.



Required properties:

- hwlocks:              List of phandle to a hwlock provider node and an

                        associated hwlock args specifier as indicated by

                        #hwlock-cells. The list can have just a single hwlock

                        or multiple hwlocks, with each hwlock represented by

                        a phandle and a corresponding args specifier.



Optional properties:

- hwlock-names:         List of hwlock name strings defined in the same order

                        as the hwlocks, with one name per hwlock. Consumers can

                        use the hwlock-names to match and get a specific hwlock.





1. Example of a node using a single specific hwlock:



The following example has a node requesting a hwlock in the bank defined by

the node hwlock1. hwlock1 is a hwlock provider with an argument specifier

of length 1.



	node {

		...

		hwlocks = <&hwlock1 2>;

		...

	};



2. Example of a node using multiple specific hwlocks:



The following example has a node requesting two hwlocks, a hwlock within

the hwlock device node 'hwlock1' with #hwlock-cells value of 1, and another

hwlock within the hwlock device node 'hwlock2' with #hwlock-cells value of 2.



	node {

		...

		hwlocks = <&hwlock1 2>, <&hwlock2 0 3>;

		...

	};

Documentation/devicetree/bindings/hwlock/omap-hwspinlock.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
OMAP4+ HwSpinlock Driver

========================



Required properties:

- compatible:		Should be "ti,omap4-hwspinlock" for

			    OMAP44xx, OMAP54xx, AM33xx, AM43xx, DRA7xx SoCs

- reg:			Contains the hwspinlock module register address space

			(base address and length)

- ti,hwmods:		Name of the hwmod associated with the hwspinlock device

- #hwlock-cells:	Should be 1. The OMAP hwspinlock users will use a

			0-indexed relative hwlock number as the argument

			specifier value for requesting a specific hwspinlock

			within a hwspinlock bank.



Please look at the generic hwlock binding for usage information for consumers,

"Documentation/devicetree/bindings/hwlock/hwlock.txt"



Example:



/* OMAP4 */

hwspinlock: spinlock@4a0f6000 {

	compatible = "ti,omap4-hwspinlock";

	reg = <0x4a0f6000 0x1000>;

	ti,hwmods = "spinlock";

	#hwlock-cells = <1>;

};

Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Qualcomm Hardware Mutex Block:



The hardware block provides mutexes utilized between different processors on

the SoC as part of the communication protocol used by these processors.



- compatible:

	Usage: required

	Value type: <string>

	Definition: must be one of:

		    "qcom,sfpb-mutex",

		    "qcom,tcsr-mutex"



- syscon:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: one cell containing:

		    syscon phandle

		    offset of the hwmutex block within the syscon

		    stride of the hwmutex registers



- #hwlock-cells:

	Usage: required

	Value type: <u32>

	Definition: must be 1, the specified cell represent the lock id

		    (hwlock standard property, see hwlock.txt)



Example:



	tcsr_mutex_block: syscon@fd484000 {

		compatible = "syscon";

		reg = <0xfd484000 0x2000>;

	};



	hwlock@fd484000 {

		compatible = "qcom,tcsr-mutex";

		syscon = <&tcsr_mutex_block 0 0x80>;



		#hwlock-cells = <1>;

	};