Merge branch 'master-tmp' into sdk-v1.6.x

master-tmp is the master branch as of
8b60f5ea90c49344692a70f62cd4aa349de38b48
with the following commits reverted due to excessive conflicts:

commit b35a69559c46e066e6f24bb02d5a6090483786e3
Author: Scott Wood <scottwood@freescale.com>
Date:   Fri Apr 18 15:27:52 2014 -0500

    Revert "net: add sysfs helpers for netdev_adjacent logic"

    This reverts commit 0be682ca768d671c91cfd1379759efcb3b29102a.

commit 1c0dc06e47e11bf758f3e84ea90c2178a31dbf0f
Author: Scott Wood <scottwood@freescale.com>
Date:   Fri Apr 18 15:27:47 2014 -0500

    Revert "net: rename sysfs symlinks on device name change"

    This reverts commit 45ce45c69750b93b8262aa66792185bd49150293.

Conflicts:
    drivers/iommu/fsl_pamu.c
    drivers/net/bonding/bond_3ad.c
    drivers/net/bonding/bond_sysfs.c
    drivers/net/bonding/bonding.h
    drivers/net/ethernet/freescale/gianfar.c

Signed-off-by: Scott Wood <scottwood@freescale.com>

Conflicts:
	drivers/iommu/fsl_pamu.c
	drivers/net/bonding/bond_3ad.c
	drivers/net/bonding/bond_sysfs.c
	drivers/net/bonding/bonding.h
	drivers/net/ethernet/freescale/gianfar.c

1 files changed, 99 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/powerpc/fsl/l2-switch.txt b/Documentation/devicetree/bindings/powerpc/fsl/l2-switch.txt
new file mode 100644
index 0000000..c192f74
--- /dev/null
+++ b/Documentation/devicetree/bindings/powerpc/fsl/l2-switch.txt
@@ -0,0 +1,99 @@
+T1040 L2switch Device Tree Binding
+Copyright (C) 2013 Freescale Semiconductor Inc.
+
+CONTENTS
+  - Overview
+  - L2switch Node
+  - Port Node
+
+=====================================================================
+Overview
+
+DESCRIPTION
+
+    T1040 integrates a Gigabit Ethernet switch core with eight 10/100/1000 Mbps
+    Ethernet ports and two 10/100/1000/2500 Mbps ports.
+
+=====================================================================
+L2switch Node
+
+Description
+
+    This node specifies the address range of l2switch configuration registers
+    and interrupts.  It also contains a set of child nodes defining the
+    Ethernet ports.
+
+PROPERTIES
+
+   - compatible
+      Usage: required
+      Value type: <string>
+      Definition: Must include "vitesse-9953"
+
+   - reg
+      Usage: required
+      Value type: <prop-encoded-array>
+      Definition: Standard property which specifies the physical address and
+      length of the l2switch configuration registers.
+
+   - interrupts
+      Usage: required
+      Value type: <prop_encoded-array>
+      Definition:  Standard property, specifies the interrupts generated by
+           this device.
+           The value of the interrupts property consists of one interrupt
+           specifier.  The format of the specifier is defined by the binding
+           document describing the node's interrupt parent.
+
+=====================================================================
+Port Node
+
+Description
+
+    This node specifies the status and connection type of each of the Ethernet
+    ports.
+
+PROPERTIES
+
+   - compatible
+     Usage: required
+     Value type: <string>
+     Definition: Must include "vitesse-9953-port"
+
+   - port-index
+     Usage: required
+     Value type: <u32>
+     Definition: Specifies the port index.  Values 0, 1 are used by the two
+             internal 10/100/1000/2500 Mbps ports, values 2-9 are used by the
+             eight external 10/100/1000 Mbps ports.
+
+   - phy-connection-type
+     Usage: required
+     Value type: <string>
+     Definition: Specifies the controller/PHY interface type.
+
+   - status
+     Usage: optional
+     Value type: <string>
+     Definition: Standard property.
+             Indicates the operational status of the port.  "disabled" is used
+             to indicate that the port is not usable (for example because the
+             QSGMII link to the PHYs is not available with current RCW).
+
+   - fixed-link
+     Usage: optional
+     Value type: <prop_encoded-array>
+     Definition: Specifies link parameters in the absence of a PHY.
+             <a b c d e> where a is emulated phy id - must be unique to among
+             all specified fixed-links, b is duplex - 0 half, 1 full, c is
+             link speed - 10/100/1000/2500, d is pause - 0 no pause, 1 pause,
+             e is asym_pause - 0 no asym_pause, 1 asym_pause.
+
+  - phy-handle
+     Usage: optional
+     Value type: <phandle>
+     Definition: The phandle for the PHY connected to this l2switch port.
+
+
+    Note: All other standard properties (see the ePAPR) are allowed but are
+    optional.