203 files changed, 5430 insertions, 458 deletions

diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt
index 7eece72b1a35..8fe815046140 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.txt
+++ b/Documentation/devicetree/bindings/arm/amlogic.txt
@@ -2,7 +2,9 @@ Amlogic MesonX device tree bindings
 -------------------------------------------
 
 Boards with the Amlogic Meson6 SoC shall have the following properties:
+  Required root node property:
+    compatible: "amlogic,meson6"
 
-Required root node property:
-
-compatible = "amlogic,meson6";
+Boards with the Amlogic Meson8 SoC shall have the following properties:
+  Required root node property:
+    compatible: "amlogic,meson8";
diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt
index 37b2cafa4e52..256b4d8bab7b 100644
--- a/Documentation/devicetree/bindings/arm/arch_timer.txt
+++ b/Documentation/devicetree/bindings/arm/arch_timer.txt
@@ -22,6 +22,14 @@ to deliver its interrupts via SPIs.
 - always-on : a boolean property. If present, the timer is powered through an
   always-on power domain, therefore it never loses context.
 
+** Optional properties:
+
+- arm,cpu-registers-not-fw-configured : Firmware does not initialize
+  any of the generic timer CPU registers, which contain their
+  architecturally-defined reset values. Only supported for 32-bit
+  systems which follow the ARMv7 architected reset values.
+
+
 Example:
 
         timer {
diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards
index c554ed3d44fb..556c8665fdbf 100644
--- a/Documentation/devicetree/bindings/arm/arm-boards
+++ b/Documentation/devicetree/bindings/arm/arm-boards
@@ -92,3 +92,68 @@ Required nodes:
 - core-module: the root node to the Versatile platforms must have
   a core-module with regs and the compatible strings
   "arm,core-module-versatile", "syscon"
+
+ARM RealView Boards
+-------------------
+The RealView boards cover tailored evaluation boards that are used to explore
+the ARM11 and Cortex A-8 and Cortex A-9 processors.
+
+Required properties (in root node):
+        /* RealView Emulation Baseboard */
+        compatible = "arm,realview-eb";
+         /* RealView Platform Baseboard for ARM1176JZF-S */
+        compatible = "arm,realview-pb1176";
+        /* RealView Platform Baseboard for ARM11 MPCore */
+        compatible = "arm,realview-pb11mp";
+        /* RealView Platform Baseboard for Cortex A-8 */
+        compatible = "arm,realview-pba8";
+        /* RealView Platform Baseboard Explore for Cortex A-9 */
+        compatible = "arm,realview-pbx";
+
+Required nodes:
+
+- soc: some node of the RealView platforms must be the SoC
+  node that contain the SoC-specific devices, withe the compatible
+  string set to one of these tuples:
+   "arm,realview-eb-soc", "simple-bus"
+   "arm,realview-pb1176-soc", "simple-bus"
+   "arm,realview-pb11mp-soc", "simple-bus"
+   "arm,realview-pba8-soc", "simple-bus"
+   "arm,realview-pbx-soc", "simple-bus"
+
+- syscon: some subnode of the RealView SoC node must be a
+  system controller node pointing to the control registers,
+  with the compatible string set to one of these tuples:
+   "arm,realview-eb-syscon", "syscon"
+   "arm,realview-pb1176-syscon", "syscon"
+   "arm,realview-pb11mp-syscon", "syscon"
+   "arm,realview-pba8-syscon", "syscon"
+   "arm,realview-pbx-syscon", "syscon"
+
+  Required properties for the system controller:
+  - regs: the location and size of the system controller registers,
+    one range of 0x1000 bytes.
+
+Example:
+
+/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "skeleton.dtsi"
+
+/ {
+        model = "ARM RealView PB1176 with device tree";
+        compatible = "arm,realview-pb1176";
+
+        soc {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "arm,realview-pb1176-soc", "simple-bus";
+                ranges;
+
+                syscon: syscon@10000000 {
+                        compatible = "arm,realview-syscon", "syscon";
+                        reg = <0x10000000 0x1000>;
+                };
+
+        };
+};
diff --git a/Documentation/devicetree/bindings/arm/bcm/cygnus.txt b/Documentation/devicetree/bindings/arm/bcm/cygnus.txt
new file mode 100644
index 000000000000..4c77169bb534
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/cygnus.txt
@@ -0,0 +1,31 @@
+Broadcom Cygnus device tree bindings
+------------------------------------
+
+
+Boards with Cygnus SoCs shall have the following properties:
+
+Required root node property:
+
+BCM11300
+compatible = "brcm,bcm11300", "brcm,cygnus";
+
+BCM11320
+compatible = "brcm,bcm11320", "brcm,cygnus";
+
+BCM11350
+compatible = "brcm,bcm11350", "brcm,cygnus";
+
+BCM11360
+compatible = "brcm,bcm11360", "brcm,cygnus";
+
+BCM58300
+compatible = "brcm,bcm58300", "brcm,cygnus";
+
+BCM58302
+compatible = "brcm,bcm58302", "brcm,cygnus";
+
+BCM58303
+compatible = "brcm,bcm58303", "brcm,cygnus";
+
+BCM58305
+compatible = "brcm,bcm58305", "brcm,cygnus";
diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
new file mode 100644
index 000000000000..d790f49066f3
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/coresight.txt
@@ -0,0 +1,204 @@
+* CoreSight Components:
+
+CoreSight components are compliant with the ARM CoreSight architecture
+specification and can be connected in various topologies to suit a particular
+SoCs tracing needs. These trace components can generally be classified as
+sinks, links and sources. Trace data produced by one or more sources flows
+through the intermediate links connecting the source to the currently selected
+sink. Each CoreSight component device should use these properties to describe
+its hardware characteristcs.
+
+* Required properties for all components *except* non-configurable replicators:
+
+        * compatible: These have to be supplemented with "arm,primecell" as
+          drivers are using the AMBA bus interface.  Possible values include:
+                - "arm,coresight-etb10", "arm,primecell";
+                - "arm,coresight-tpiu", "arm,primecell";
+                - "arm,coresight-tmc", "arm,primecell";
+                - "arm,coresight-funnel", "arm,primecell";
+                - "arm,coresight-etm3x", "arm,primecell";
+
+        * reg: physical base address and length of the register
+          set(s) of the component.
+
+        * clocks: the clock associated to this component.
+
+        * clock-names: the name of the clock as referenced by the code.
+          Since we are using the AMBA framework, the name should be
+          "apb_pclk".
+
+        * port or ports: The representation of the component's port
+          layout using the generic DT graph presentation found in
+          "bindings/graph.txt".
+
+* Required properties for devices that don't show up on the AMBA bus, such as
+  non-configurable replicators:
+
+        * compatible: Currently supported value is (note the absence of the
+          AMBA markee):
+                - "arm,coresight-replicator"
+
+        * id: a unique number that will identify this replicator.
+
+        * port or ports: same as above.
+
+* Optional properties for ETM/PTMs:
+
+        * arm,cp14: must be present if the system accesses ETM/PTM management
+          registers via co-processor 14.
+
+        * cpu: the cpu phandle this ETM/PTM is affined to. When omitted the
+          source is considered to belong to CPU0.
+
+* Optional property for TMC:
+
+        * arm,buffer-size: size of contiguous buffer space for TMC ETR
+         (embedded trace router)
+
+
+Example:
+
+1. Sinks
+        etb@20010000 {
+                compatible = "arm,coresight-etb10", "arm,primecell";
+                reg = <0 0x20010000 0 0x1000>;
+
+                coresight-default-sink;
+                clocks = <&oscclk6a>;
+                clock-names = "apb_pclk";
+                port {
+                        etb_in_port: endpoint@0 {
+                                slave-mode;
+                                remote-endpoint = <&replicator_out_port0>;
+                        };
+                };
+        };
+
+        tpiu@20030000 {
+                compatible = "arm,coresight-tpiu", "arm,primecell";
+                reg = <0 0x20030000 0 0x1000>;
+
+                clocks = <&oscclk6a>;
+                clock-names = "apb_pclk";
+                port {
+                        tpiu_in_port: endpoint@0 {
+                                slave-mode;
+                                remote-endpoint = <&replicator_out_port1>;
+                        };
+                };
+        };
+
+2. Links
+        replicator {
+                /* non-configurable replicators don't show up on the
+                 * AMBA bus.  As such no need to add "arm,primecell".
+                 */
+                compatible = "arm,coresight-replicator";
+                /* this will show up in debugfs as "0.replicator" */
+                id = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        /* replicator output ports */
+                        port@0 {
+                                reg = <0>;
+                                replicator_out_port0: endpoint {
+                                        remote-endpoint = <&etb_in_port>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+                                replicator_out_port1: endpoint {
+                                        remote-endpoint = <&tpiu_in_port>;
+                                };
+                        };
+
+                        /* replicator input port */
+                        port@2 {
+                                reg = <0>;
+                                replicator_in_port0: endpoint {
+                                        slave-mode;
+                                        remote-endpoint = <&funnel_out_port0>;
+                                };
+                        };
+                };
+        };
+
+        funnel@20040000 {
+                compatible = "arm,coresight-funnel", "arm,primecell";
+                reg = <0 0x20040000 0 0x1000>;
+
+                clocks = <&oscclk6a>;
+                clock-names = "apb_pclk";
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        /* funnel output port */
+                        port@0 {
+                                reg = <0>;
+                                funnel_out_port0: endpoint {
+                                        remote-endpoint =
+                                                        <&replicator_in_port0>;
+                                };
+                        };
+
+                        /* funnel input ports */
+                        port@1 {
+                                reg = <0>;
+                                funnel_in_port0: endpoint {
+                                        slave-mode;
+                                        remote-endpoint = <&ptm0_out_port>;
+                                };
+                        };
+
+                        port@2 {
+                                reg = <1>;
+                                funnel_in_port1: endpoint {
+                                        slave-mode;
+                                        remote-endpoint = <&ptm1_out_port>;
+                                };
+                        };
+
+                        port@3 {
+                                reg = <2>;
+                                funnel_in_port2: endpoint {
+                                        slave-mode;
+                                        remote-endpoint = <&etm0_out_port>;
+                                };
+                        };
+
+                };
+        };
+
+3. Sources
+        ptm@2201c000 {
+                compatible = "arm,coresight-etm3x", "arm,primecell";
+                reg = <0 0x2201c000 0 0x1000>;
+
+                cpu = <&cpu0>;
+                clocks = <&oscclk6a>;
+                clock-names = "apb_pclk";
+                port {
+                        ptm0_out_port: endpoint {
+                                remote-endpoint = <&funnel_in_port0>;
+                        };
+                };
+        };
+
+        ptm@2201d000 {
+                compatible = "arm,coresight-etm3x", "arm,primecell";
+                reg = <0 0x2201d000 0 0x1000>;
+
+                cpu = <&cpu1>;
+                clocks = <&oscclk6a>;
+                clock-names = "apb_pclk";
+                port {
+                        ptm1_out_port: endpoint {
+                                remote-endpoint = <&funnel_in_port1>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index fc446347ab6d..b2aacbe16ed9 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -227,6 +227,15 @@ nodes to be present and contain the properties described below.
                         # List of phandles to idle state nodes supported
                           by this cpu [3].
 
+        - rockchip,pmu
+                Usage: optional for systems that have an "enable-method"
+                       property value of "rockchip,rk3066-smp"
+                       While optional, it is the preferred way to get access to
+                       the cpu-core power-domains.
+                Value type: <phandle>
+                Definition: Specifies the syscon node controlling the cpu core
+                            power domains.
+
 Example 1 (dual-cluster big.LITTLE system 32-bit):
 
         cpus {
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index e935d7d4ac43..4e8b7df7fc62 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -74,3 +74,41 @@ Required root node properties:
 i.MX6q generic board
 Required root node properties:
     - compatible = "fsl,imx6q";
+
+
+Freescale LS1021A Platform Device Tree Bindings
+------------------------------------------------
+
+Required root node compatible properties:
+  - compatible = "fsl,ls1021a";
+
+Freescale LS1021A SoC-specific Device Tree Bindings
+-------------------------------------------
+
+Freescale SCFG
+  SCFG is the supplemental configuration unit, that provides SoC specific
+configuration and status registers for the chip. Such as getting PEX port
+status.
+  Required properties:
+  - compatible: should be "fsl,ls1021a-scfg"
+  - reg: should contain base address and length of SCFG memory-mapped registers
+
+Example:
+        scfg: scfg@1570000 {
+                compatible = "fsl,ls1021a-scfg";
+                reg = <0x0 0x1570000 0x0 0x10000>;
+        };
+
+Freescale DCFG
+  DCFG is the device configuration unit, that provides general purpose
+configuration and status for the device. Such as setting the secondary
+core start address and release the secondary core from holdoff and startup.
+  Required properties:
+  - compatible: should be "fsl,ls1021a-dcfg"
+  - reg : should contain base address and length of DCFG memory-mapped registers
+
+Example:
+        dcfg: dcfg@1ee0000 {
+                compatible = "fsl,ls1021a-dcfg";
+                reg = <0x0 0x1ee0000 0x0 0x10000>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/gic-v3.txt b/Documentation/devicetree/bindings/arm/gic-v3.txt
index 33cd05e6c125..ddfade40ac59 100644
--- a/Documentation/devicetree/bindings/arm/gic-v3.txt
+++ b/Documentation/devicetree/bindings/arm/gic-v3.txt
@@ -49,11 +49,29 @@ Optional
   occupied by the redistributors. Required if more than one such
   region is present.
 
+Sub-nodes:
+
+GICv3 has one or more Interrupt Translation Services (ITS) that are
+used to route Message Signalled Interrupts (MSI) to the CPUs.
+
+These nodes must have the following properties:
+- compatible : Should at least contain  "arm,gic-v3-its".
+- msi-controller : Boolean property. Identifies the node as an MSI controller
+- reg: Specifies the base physical address and size of the ITS
+  registers.
+
+The main GIC node must contain the appropriate #address-cells,
+#size-cells and ranges properties for the reg property of all ITS
+nodes.
+
 Examples:
 
         gic: interrupt-controller@2cf00000 {
                 compatible = "arm,gic-v3";
                 #interrupt-cells = <3>;
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
                 interrupt-controller;
                 reg = <0x0 0x2f000000 0 0x10000>,       // GICD
                       <0x0 0x2f100000 0 0x200000>,      // GICR
@@ -61,11 +79,20 @@ Examples:
                       <0x0 0x2c010000 0 0x2000>,        // GICH
                       <0x0 0x2c020000 0 0x2000>;        // GICV
                 interrupts = <1 9 4>;
+
+                gic-its@2c200000 {
+                        compatible = "arm,gic-v3-its";
+                        msi-controller;
+                        reg = <0x0 0x2c200000 0 0x200000>;
+                };
         };
 
         gic: interrupt-controller@2c010000 {
                 compatible = "arm,gic-v3";
                 #interrupt-cells = <3>;
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
                 interrupt-controller;
                 redistributor-stride = <0x0 0x40000>;   // 256kB stride
                 #redistributor-regions = <2>;
@@ -76,4 +103,16 @@ Examples:
                       <0x0 0x2c060000 0 0x2000>,        // GICH
                       <0x0 0x2c080000 0 0x2000>;        // GICV
                 interrupts = <1 9 4>;
+
+                gic-its@2c200000 {
+                        compatible = "arm,gic-v3-its";
+                        msi-controller;
+                        reg = <0x0 0x2c200000 0 0x200000>;
+                };
+
+                gic-its@2c400000 {
+                        compatible = "arm,gic-v3-its";
+                        msi-controller;
+                        reg = <0x0 0x2c400000 0 0x200000>;
+                };
         };
diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt
index c7d2fa156678..8112d0c3675a 100644
--- a/Documentation/devicetree/bindings/arm/gic.txt
+++ b/Documentation/devicetree/bindings/arm/gic.txt
@@ -17,6 +17,7 @@ Main node required properties:
         "arm,cortex-a7-gic"
         "arm,arm11mp-gic"
         "brcm,brahma-b15-gic"
+        "arm,arm1176jzf-devchip-gic"
 - interrupt-controller : Identifies the node as an interrupt controller
 - #interrupt-cells : Specifies the number of cells needed to encode an
   interrupt source.  The type shall be a <u32> and the value shall be 3.
@@ -96,3 +97,56 @@ Example:
                       <0x2c006000 0x2000>;
                 interrupts = <1 9 0xf04>;
         };
+
+
+* GICv2m extension for MSI/MSI-x support (Optional)
+
+Certain revisions of GIC-400 supports MSI/MSI-x via V2M register frame(s).
+This is enabled by specifying v2m sub-node(s).
+
+Required properties:
+
+- compatible        : The value here should contain "arm,gic-v2m-frame".
+
+- msi-controller    : Identifies the node as an MSI controller.
+
+- reg               : GICv2m MSI interface register base and size
+
+Optional properties:
+
+- arm,msi-base-spi  : When the MSI_TYPER register contains an incorrect
+                      value, this property should contain the SPI base of
+                      the MSI frame, overriding the HW value.
+
+- arm,msi-num-spis  : When the MSI_TYPER register contains an incorrect
+                      value, this property should contain the number of
+                      SPIs assigned to the frame, overriding the HW value.
+
+Example:
+
+        interrupt-controller@e1101000 {
+                compatible = "arm,gic-400";
+                #interrupt-cells = <3>;
+                #address-cells = <2>;
+                #size-cells = <2>;
+                interrupt-controller;
+                interrupts = <1 8 0xf04>;
+                ranges = <0 0 0 0xe1100000 0 0x100000>;
+                reg = <0x0 0xe1110000 0 0x01000>,
+                      <0x0 0xe112f000 0 0x02000>,
+                      <0x0 0xe1140000 0 0x10000>,
+                      <0x0 0xe1160000 0 0x10000>;
+                v2m0: v2m@0x8000 {
+                        compatible = "arm,gic-v2m-frame";
+                        msi-controller;
+                        reg = <0x0 0x80000 0 0x1000>;
+                };
+
+                ....
+
+                v2mN: v2m@0x9000 {
+                        compatible = "arm,gic-v2m-frame";
+                        msi-controller;
+                        reg = <0x0 0x90000 0 0x1000>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/arm/idle-states.txt b/Documentation/devicetree/bindings/arm/idle-states.txt
index 37375c7f3ccc..a8274eabae2e 100644
--- a/Documentation/devicetree/bindings/arm/idle-states.txt
+++ b/Documentation/devicetree/bindings/arm/idle-states.txt
@@ -317,6 +317,26 @@ follows:
                             In such systems entry-latency-us + exit-latency-us
                             will exceed wakeup-latency-us by this duration.
 
+        - status:
+                Usage: Optional
+                Value type: <string>
+                Definition: A standard device tree property [5] that indicates
+                            the operational status of an idle-state.
+                            If present, it shall be:
+                            "okay": to indicate that the idle state is
+                                    operational.
+                            "disabled": to indicate that the idle state has
+                                        been disabled in firmware so it is not
+                                        operational.
+                            If the property is not present the idle-state must
+                            be considered operational.
+
+        - idle-state-name:
+                Usage: Optional
+                Value type: <string>
+                Definition: A string used as a descriptive name for the idle
+                            state.
+
         In addition to the properties listed above, a state node may require
         additional properties specifics to the entry-method defined in the
         idle-states node, please refer to the entry-method bindings
diff --git a/Documentation/devicetree/bindings/arm/marvell,berlin.txt b/Documentation/devicetree/bindings/arm/marvell,berlin.txt
index 904de5781f44..a99eb9eb14c0 100644
--- a/Documentation/devicetree/bindings/arm/marvell,berlin.txt
+++ b/Documentation/devicetree/bindings/arm/marvell,berlin.txt
@@ -106,11 +106,21 @@ Required subnode-properties:
 - groups: a list of strings describing the group names.
 - function: a string describing the function used to mux the groups.
 
+* Reset controller binding
+
+A reset controller is part of the chip control registers set. The chip control
+node also provides the reset. The register set is not at the same offset between
+Berlin SoCs.
+
+Required property:
+- #reset-cells: must be set to 2
+
 Example:
 
 chip: chip-control@ea0000 {
         compatible = "marvell,berlin2-chip-ctrl";
         #clock-cells = <1>;
+        #reset-cells = <2>;
         reg = <0xea0000 0x400>;
         clocks = <&refclk>, <&externaldev 0>;
         clock-names = "refclk", "video_ext0";
diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt
index fa252261dfaf..3be40139cfbb 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek.txt
@@ -1,10 +1,14 @@
-Mediatek MT6589 Platforms Device Tree Bindings
+MediaTek mt65xx & mt81xx Platforms Device Tree Bindings
 
-Boards with a SoC of the Mediatek MT6589 shall have the following property:
+Boards with a MediaTek mt65xx/mt81xx SoC shall have the following property:
 
 Required root node property:
 
-compatible: must contain "mediatek,mt6589"
+compatible: Must contain one of
+   "mediatek,mt6589"
+   "mediatek,mt6592"
+   "mediatek,mt8127"
+   "mediatek,mt8135"
 
 
 Supported boards:
@@ -12,3 +16,12 @@ Supported boards:
 - bq Aquaris5 smart phone:
     Required root node properties:
       - compatible = "mundoreader,bq-aquaris5", "mediatek,mt6589";
+- Evaluation board for MT6592:
+    Required root node properties:
+      - compatible = "mediatek,mt6592-evb", "mediatek,mt6592";
+- MTK mt8127 tablet moose EVB:
+    Required root node properties:
+      - compatible = "mediatek,mt8127-moose", "mediatek,mt8127";
+- MTK mt8135 tablet EVB:
+    Required root node properties:
+      - compatible = "mediatek,mt8135-evbp1", "mediatek,mt8135";
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
new file mode 100644
index 000000000000..d680b07ec6e8
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
@@ -0,0 +1,28 @@
+Mediatek 65xx/81xx sysirq
+
+Mediatek SOCs sysirq support controllable irq inverter for each GIC SPI
+interrupt.
+
+Required properties:
+- compatible: should be one of:
+        "mediatek,mt8135-sysirq"
+        "mediatek,mt8127-sysirq"
+        "mediatek,mt6589-sysirq"
+        "mediatek,mt6582-sysirq"
+        "mediatek,mt6577-sysirq"
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Use the same format as specified by GIC in
+  Documentation/devicetree/bindings/arm/gic.txt
+- interrupt-parent: phandle of irq parent for sysirq. The parent must
+  use the same interrupt-cells format as GIC.
+- reg: Physical base address of the intpol registers and length of memory
+  mapped region.
+
+Example:
+        sysirq: interrupt-controller@10200100 {
+                compatible = "mediatek,mt6589-sysirq", "mediatek,mt6577-sysirq";
+                interrupt-controller;
+                #interrupt-cells = <3>;
+                interrupt-parent = <&gic>;
+                reg = <0 0x10200100 0 0x1c>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index ddd9bcdf889c..4f6a82cef1d1 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -132,6 +132,9 @@ Boards:
 - AM335X Bone : Low cost community board
   compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"
 
+- AM335X OrionLXm : Substation Automation Platform
+  compatible = "novatech,am335x-lxm", "ti,am33xx"
+
 - OMAP5 EVM : Evaluation Module
   compatible = "ti,omap5-evm", "ti,omap5"
 
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index 857f12636eb2..eaa3d1a0eb05 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -1,6 +1,10 @@
 Rockchip platforms device tree bindings
 ---------------------------------------
 
+- MarsBoard RK3066 board:
+    Required root node properties:
+      - compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";
+
 - bq Curie 2 tablet:
     Required root node properties:
       - compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
diff --git a/Documentation/devicetree/bindings/arm/samsung-boards.txt b/Documentation/devicetree/bindings/arm/samsung-boards.txt
index 2168ed31e1b0..43589d2466a7 100644
--- a/Documentation/devicetree/bindings/arm/samsung-boards.txt
+++ b/Documentation/devicetree/bindings/arm/samsung-boards.txt
@@ -1,11 +1,20 @@
-* Samsung's Exynos4210 based SMDKV310 evaluation board
-
-SMDKV310 evaluation board is based on Samsung's Exynos4210 SoC.
+* Samsung's Exynos SoC based boards
 
 Required root node properties:
     - compatible = should be one or more of the following.
-        (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.
-        (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.
+        - "samsung,monk"        - for Exynos3250-based Samsung Simband board.
+        - "samsung,rinato"      - for Exynos3250-based Samsung Gear2 board.
+        - "samsung,smdkv310"    - for Exynos4210-based Samsung SMDKV310 eval board.
+        - "samsung,trats"       - for Exynos4210-based Tizen Reference board.
+        - "samsung,universal_c210" - for Exynos4210-based Samsung board.
+        - "samsung,smdk4412",   - for Exynos4412-based Samsung SMDK4412 eval board.
+        - "samsung,trats2"      - for Exynos4412-based Tizen Reference board.
+        - "samsung,smdk5250"    - for Exynos5250-based Samsung SMDK5250 eval board.
+        - "samsung,xyref5260"   - for Exynos5260-based Samsung board.
+        - "samsung,smdk5410"    - for Exynos5410-based Samsung SMDK5410 eval board.
+        - "samsung,smdk5420"    - for Exynos5420-based Samsung SMDK5420 eval board.
+        - "samsung,sd5v1"       - for Exynos5440-based Samsung board.
+        - "samsung,ssdk5440"    - for Exynos5440-based Samsung board.
 
 Optional:
     - firmware node, specifying presence and type of secure firmware:
diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
index 709efaa30841..f46ca9a316a2 100644
--- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
@@ -16,6 +16,8 @@ Required properties:
                                 future controllers.
                         Must be "samsung,exynos3250-adc" for
                                 controllers compatible with ADC of Exynos3250.
+                        Must be "samsung,exynos7-adc" for
+                                the ADC in Exynos7 and compatibles
                         Must be "samsung,s3c2410-adc" for
                                 the ADC in s3c2410 and compatibles
                         Must be "samsung,s3c2416-adc" for
@@ -43,13 +45,16 @@ Required properties:
                                    compatible ADC block)
 - vdd-supply            VDD input supply.
 
+- samsung,syscon-phandle Contains the PMU system controller node
+                        (To access the ADC_PHY register on Exynos5250/5420/5800/3250)
+
 Note: child nodes can be added for auto probing from device tree.
 
 Example: adding device info in dtsi file
 
 adc: adc@12D10000 {
         compatible = "samsung,exynos-adc-v1";
-        reg = <0x12D10000 0x100>, <0x10040718 0x4>;
+        reg = <0x12D10000 0x100>;
         interrupts = <0 106 0>;
         #io-channel-cells = <1>;
         io-channel-ranges;
@@ -58,13 +63,14 @@ adc: adc@12D10000 {
         clock-names = "adc";
 
         vdd-supply = <&buck5_reg>;
+        samsung,syscon-phandle = <&pmu_system_controller>;
 };
 
 Example: adding device info in dtsi file for Exynos3250 with additional sclk
 
 adc: adc@126C0000 {
         compatible = "samsung,exynos3250-adc", "samsung,exynos-adc-v2;
-        reg = <0x126C0000 0x100>, <0x10020718 0x4>;
+        reg = <0x126C0000 0x100>;
         interrupts = <0 137 0>;
         #io-channel-cells = <1>;
         io-channel-ranges;
@@ -73,6 +79,7 @@ adc: adc@126C0000 {
         clock-names = "adc", "sclk";
 
         vdd-supply = <&buck5_reg>;
+        samsung,syscon-phandle = <&pmu_system_controller>;
 };
 
 Example: Adding child nodes in dts file
diff --git a/Documentation/devicetree/bindings/arm/ste-nomadik.txt b/Documentation/devicetree/bindings/arm/ste-nomadik.txt
index 6256ec31666d..2fdff5a806cf 100644
--- a/Documentation/devicetree/bindings/arm/ste-nomadik.txt
+++ b/Documentation/devicetree/bindings/arm/ste-nomadik.txt
@@ -10,6 +10,12 @@ Required root node property: src
 
 Boards with the Nomadik SoC include:
 
+Nomadik NHK-15 board manufactured by ST Microelectronics:
+
+Required root node property:
+
+compatible="st,nomadik-nhk-15";
+
 S8815 "MiniKit" manufactured by Calao Systems:
 
 Required root node property:
diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
new file mode 100644
index 000000000000..42941fdefb11
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
@@ -0,0 +1,12 @@
+Allwinner sunXi Platforms Device Tree Bindings
+
+Each device tree must specify which Allwinner SoC it uses,
+using one of the following compatible strings:
+
+  allwinner,sun4i-a10
+  allwinner,sun5i-a10s
+  allwinner,sun5i-a13
+  allwinner,sun6i-a31
+  allwinner,sun7i-a20
+  allwinner,sun8i-a23
+  allwinner,sun9i-a80
diff --git a/Documentation/devicetree/bindings/arm/ux500/power_domain.txt b/Documentation/devicetree/bindings/arm/ux500/power_domain.txt
new file mode 100644
index 000000000000..5679d1742d3e
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/ux500/power_domain.txt
@@ -0,0 +1,35 @@
+* ST-Ericsson UX500 PM Domains
+
+UX500 supports multiple PM domains which are used to gate power to one or
+more peripherals on the SOC.
+
+The implementation of PM domains for UX500 are based upon the generic PM domain
+and use the corresponding DT bindings.
+
+==PM domain providers==
+
+Required properties:
+ - compatible: Must be "stericsson,ux500-pm-domains".
+ - #power-domain-cells : Number of cells in a power domain specifier, must be 1.
+
+Example:
+        pm_domains: pm_domains0 {
+                compatible = "stericsson,ux500-pm-domains";
+                #power-domain-cells = <1>;
+        };
+
+==PM domain consumers==
+
+Required properties:
+ - power-domains: A phandle and PM domain specifier. Below are the list of
+                valid specifiers:
+
+                Index   Specifier
+                -----   ---------
+                0       DOMAIN_VAPE
+
+Example:
+        sdi0_per1@80126000 {
+                compatible = "arm,pl18x", "arm,primecell";
+                power-domains = <&pm_domains DOMAIN_VAPE>
+        };
diff --git a/Documentation/devicetree/bindings/ata/marvell.txt b/Documentation/devicetree/bindings/ata/marvell.txt
index 1c8351604d38..b460edd12766 100644
--- a/Documentation/devicetree/bindings/ata/marvell.txt
+++ b/Documentation/devicetree/bindings/ata/marvell.txt
@@ -6,11 +6,17 @@ Required Properties:
 - interrupts    : Interrupt controller is using
 - nr-ports      : Number of SATA ports in use.
 
+Optional Properties:
+- phys          : List of phandles to sata phys
+- phy-names     : Should be "0", "1", etc, one number per phandle
+
 Example:
 
         sata@80000 {
                 compatible = "marvell,orion-sata";
                 reg = <0x80000 0x5000>;
                 interrupts = <21>;
+                phys = <&sata_phy0>, <&sata_phy1>;
+                phy-names = "0", "1";
                 nr-ports = <2>;
         }
diff --git a/Documentation/devicetree/bindings/ata/sata_rcar.txt b/Documentation/devicetree/bindings/ata/sata_rcar.txt
index 1e6111333fa8..2493a5a31655 100644
--- a/Documentation/devicetree/bindings/ata/sata_rcar.txt
+++ b/Documentation/devicetree/bindings/ata/sata_rcar.txt
@@ -3,16 +3,21 @@
 Required properties:
 - compatible            : should contain one of the following:
                           - "renesas,sata-r8a7779" for R-Car H1
-                          - "renesas,sata-r8a7790" for R-Car H2
-                          - "renesas,sata-r8a7791" for R-Car M2
+                            ("renesas,rcar-sata" is deprecated)
+                          - "renesas,sata-r8a7790-es1" for R-Car H2 ES1
+                          - "renesas,sata-r8a7790" for R-Car H2 other than ES1
+                          - "renesas,sata-r8a7791" for R-Car M2-W
+                          - "renesas,sata-r8a7793" for R-Car M2-N
 - reg                   : address and length of the SATA registers;
 - interrupts            : must consist of one interrupt specifier.
+- clocks                : must contain a reference to the functional clock.
 
 Example:
 
-sata: sata@fc600000 {
-        compatible = "renesas,sata-r8a7779";
-        reg = <0xfc600000 0x2000>;
+sata0: sata@ee300000 {
+        compatible = "renesas,sata-r8a7791";
+        reg = <0 0xee300000 0 0x2000>;
         interrupt-parent = <&gic>;
-        interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
+        interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&mstp8_clks R8A7791_CLK_SATA0>;
 };
diff --git a/Documentation/devicetree/bindings/btmrvl.txt b/Documentation/devicetree/bindings/btmrvl.txt
new file mode 100644
index 000000000000..58f964bb0a52
--- /dev/null
+++ b/Documentation/devicetree/bindings/btmrvl.txt
@@ -0,0 +1,29 @@
+btmrvl
+------
+
+Required properties:
+
+  - compatible : must be "btmrvl,cfgdata"
+
+Optional properties:
+
+  - btmrvl,cal-data : Calibration data downloaded to the device during
+                      initialization. This is an array of 28 values(u8).
+
+  - btmrvl,gpio-gap : gpio and gap (in msecs) combination to be
+                      configured.
+
+Example:
+
+GPIO pin 13 is configured as a wakeup source and GAP is set to 100 msecs
+in below example.
+
+btmrvl {
+        compatible = "btmrvl,cfgdata";
+
+        btmrvl,cal-data = /bits/ 8 <
+                0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02
+                0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00
+                0x00 0x00 0xf0 0x00>;
+        btmrvl,gpio-gap = <0x0d64>;
+};
diff --git a/Documentation/devicetree/bindings/bus/bcma.txt b/Documentation/devicetree/bindings/bus/bcma.txt
index 62a48348ac15..edd44d802139 100644
--- a/Documentation/devicetree/bindings/bus/bcma.txt
+++ b/Documentation/devicetree/bindings/bus/bcma.txt
@@ -8,6 +8,11 @@ Required properties:
 
 The cores on the AXI bus are automatically detected by bcma with the
 memory ranges they are using and they get registered afterwards.
+Automatic detection of the IRQ number is not working on
+BCM47xx/BCM53xx ARM SoCs. To assign IRQ numbers to the cores, provide
+them manually through device tree. Use an interrupt-map to specify the
+IRQ used by the devices on the bus. The first address is just an index,
+because we do not have any special register.
 
 The top-level axi bus may contain children representing attached cores
 (devices). This is needed since some hardware details can't be auto
@@ -22,6 +27,22 @@ Example:
                 ranges = <0x00000000 0x18000000 0x00100000>;
                 #address-cells = <1>;
                 #size-cells = <1>;
+                #interrupt-cells = <1>;
+                interrupt-map-mask = <0x000fffff 0xffff>;
+                interrupt-map =
+                        /* Ethernet Controller 0 */
+                        <0x00024000 0 &gic GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
+
+                        /* Ethernet Controller 1 */
+                        <0x00025000 0 &gic GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+
+                        /* PCIe Controller 0 */
+                        <0x00012000 0 &gic GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                        <0x00012000 1 &gic GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
+                        <0x00012000 2 &gic GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
+                        <0x00012000 3 &gic GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
+                        <0x00012000 4 &gic GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
+                        <0x00012000 5 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
 
                 chipcommon {
                         reg = <0x00000000 0x1000>;
diff --git a/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt b/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt
index e2d501d20c9a..1eceefb20f01 100644
--- a/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt
+++ b/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt
@@ -2,7 +2,11 @@ Broadcom GISB bus Arbiter controller
 
 Required properties:
 
-- compatible: should be "brcm,gisb-arb"
+- compatible:
+    "brcm,gisb-arb" or "brcm,bcm7445-gisb-arb" for 28nm chips
+    "brcm,bcm7435-gisb-arb" for newer 40nm chips
+    "brcm,bcm7400-gisb-arb" for older 40nm chips and all 65nm chips
+    "brcm,bcm7038-gisb-arb" for 130nm chips
 - reg: specifies the base physical address and size of the registers
 - interrupt-parent: specifies the phandle to the parent interrupt controller
   this arbiter gets interrupt line from
diff --git a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
index 5fa44f52a0b8..5e16c3ccb061 100644
--- a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
+++ b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
@@ -48,9 +48,12 @@ Required properties:
 - compatible:   Should be set to "marvell,mbus-controller".
 
 - reg:          Device's register space.
-                Two entries are expected (see the examples below):
-                the first one controls the devices decoding window and
-                the second one controls the SDRAM decoding window.
+                Two or three entries are expected (see the examples below):
+                the first one controls the devices decoding window,
+                the second one controls the SDRAM decoding window and
+                the third controls the MBus bridge (only with the
+                marvell,armada370-mbus and marvell,armadaxp-mbus
+                compatible strings)
 
 Example:
 
@@ -67,7 +70,7 @@ Example:
 
                         mbusc: mbus-controller@20000 {
                                 compatible = "marvell,mbus-controller";
-                                reg = <0x20000 0x100>, <0x20180 0x20>;
+                                reg = <0x20000 0x100>, <0x20180 0x20>, <0x20250 0x8>;
                         };
 
                         /* more children ...*/
@@ -126,7 +129,7 @@ are skipped.
 
                         mbusc: mbus-controller@20000 {
                                 compatible = "marvell,mbus-controller";
-                                reg = <0x20000 0x100>, <0x20180 0x20>;
+                                reg = <0x20000 0x100>, <0x20180 0x20>, <0x20250 0x8>;
                         };
 
                         /* more children ...*/
@@ -170,7 +173,7 @@ Using this macro, the above example would be:
 
                         mbusc: mbus-controller@20000 {
                                 compatible = "marvell,mbus-controller";
-                                reg = <0x20000 0x100>, <0x20180 0x20>;
+                                reg = <0x20000 0x100>, <0x20180 0x20>, <0x20250 0x8>;
                         };
 
                         /* other children */
@@ -266,7 +269,7 @@ See the example below, where a more complete device tree is shown:
                         ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
 
                         mbusc: mbus-controller@20000 {
-                                reg = <0x20000 0x100>, <0x20180 0x20>;
+                                reg = <0x20000 0x100>, <0x20180 0x20>, <0x20250 0x8>;
                         };
 
                         interrupt-controller@20000 {
diff --git a/Documentation/devicetree/bindings/chosen.txt b/Documentation/devicetree/bindings/chosen.txt
new file mode 100644
index 000000000000..ed838f453f7a
--- /dev/null
+++ b/Documentation/devicetree/bindings/chosen.txt
@@ -0,0 +1,46 @@
+The chosen node
+---------------
+
+The chosen node does not represent a real device, but serves as a place
+for passing data between firmware and the operating system, like boot
+arguments. Data in the chosen node does not represent the hardware.
+
+
+stdout-path property
+--------------------
+
+Device trees may specify the device to be used for boot console output
+with a stdout-path property under /chosen, as described in ePAPR, e.g.
+
+/ {
+        chosen {
+                stdout-path = "/serial@f00:115200";
+        };
+
+        serial@f00 {
+                compatible = "vendor,some-uart";
+                reg = <0xf00 0x10>;
+        };
+};
+
+If the character ":" is present in the value, this terminates the path.
+The meaning of any characters following the ":" is device-specific, and
+must be specified in the relevant binding documentation.
+
+For UART devices, the preferred binding is a string in the form:
+
+        <baud>{<parity>{<bits>{<flow>}}}
+
+where
+
+        baud    - baud rate in decimal
+        parity  - 'n' (none), 'o', (odd) or 'e' (even)
+        bits    - number of data bits
+        flow    - 'r' (rts)
+
+For example: 115200n8r
+
+Implementation note: Linux will look for the property "linux,stdout-path" or
+on PowerPC "stdout" if "stdout-path" is not found.  However, the
+"linux,stdout-path" and "stdout" properties are deprecated. New platforms
+should only use the "stdout-path" property.
diff --git a/Documentation/devicetree/bindings/clock/bcm-cygnus-clock.txt b/Documentation/devicetree/bindings/clock/bcm-cygnus-clock.txt
new file mode 100644
index 000000000000..00d26edec8bc
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/bcm-cygnus-clock.txt
@@ -0,0 +1,34 @@
+Broadcom Cygnus Clocks
+
+This binding uses the common clock binding:
+Documentation/devicetree/bindings/clock/clock-bindings.txt
+
+Currently various "fixed" clocks are declared for peripheral drivers that use
+the common clock framework to reference their core clocks. Proper support of
+these clocks will be added later
+
+Device tree example:
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                osc: oscillator {
+                        compatible = "fixed-clock";
+                        #clock-cells = <1>;
+                        clock-frequency = <25000000>;
+                };
+
+                apb_clk: apb_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <1000000000>;
+                };
+
+                periph_clk: periph_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <500000000>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
index 5666812fc42b..266ff9d23229 100644
--- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt
+++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
@@ -62,6 +62,8 @@ Required properties:
                 It takes parent's clock-frequency as its clock.
         * "fsl,qoriq-sysclk-2.0": for input system clock (v2.0).
                 It takes parent's clock-frequency as its clock.
+        * "fsl,qoriq-platform-pll-1.0" for the platform PLL clock (v1.0)
+        * "fsl,qoriq-platform-pll-2.0" for the platform PLL clock (v2.0)
 - #clock-cells: From common clock binding. The number of cells in a
         clock-specifier. Should be <0> for "fsl,qoriq-sysclk-[1,2].0"
         clocks, or <1> for "fsl,qoriq-core-pll-[1,2].0" clocks.
@@ -128,8 +130,16 @@ Example for clock block and clock provider:
                         clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
                         clock-output-names = "cmux1";
                 };
+
+                platform-pll: platform-pll@c00 {
+                        #clock-cells = <1>;
+                        reg = <0xc00 0x4>;
+                        compatible = "fsl,qoriq-platform-pll-1.0";
+                        clocks = <&sysclk>;
+                        clock-output-names = "platform-pll", "platform-pll-div2";
+                };
         };
-  }
+};
 
 Example for clock consumer:
 
@@ -139,4 +149,4 @@ Example for clock consumer:
                 clocks = <&mux0>;
                 ...
         };
-  }
+};
diff --git a/Documentation/devicetree/bindings/clock/st/st,flexgen.txt b/Documentation/devicetree/bindings/clock/st/st,flexgen.txt
index 1d3ace088172..b7ee5c7e0f75 100644
--- a/Documentation/devicetree/bindings/clock/st/st,flexgen.txt
+++ b/Documentation/devicetree/bindings/clock/st/st,flexgen.txt
@@ -11,7 +11,7 @@ Please find an example below:
 
     Clockgen block diagram
     -------------------------------------------------------------------
-   |                     Flexgen stucture                              |
+   |                     Flexgen structure                             |
    |                  ---------------------------------------------    |
    |                 |    -------       --------       --------    |   |
 clk_sysin            |   |       |     |        |     |        |   |   |
diff --git a/Documentation/devicetree/bindings/clock/vf610-clock.txt b/Documentation/devicetree/bindings/clock/vf610-clock.txt
index c80863d344ac..63f9f1ac3439 100644
--- a/Documentation/devicetree/bindings/clock/vf610-clock.txt
+++ b/Documentation/devicetree/bindings/clock/vf610-clock.txt
@@ -5,6 +5,19 @@ Required properties:
 - reg: Address and length of the register set
 - #clock-cells: Should be <1>
 
+Optional properties:
+- clocks: list of clock identifiers which are external input clocks to the
+        given clock controller. Please refer the next section to find
+        the input clocks for a given controller.
+- clock-names: list of names of clocks which are exteral input clocks to the
+        given clock controller.
+
+Input clocks for top clock controller:
+        - sxosc (external crystal oscillator 32KHz, recommended)
+        - fxosc (external crystal oscillator 24MHz, recommended)
+        - audio_ext
+        - enet_ext
+
 The clock consumer should specify the desired clock by having the clock
 ID in its "clocks" phandle cell. See include/dt-bindings/clock/vf610-clock.h
 for the full list of VF610 clock IDs.
@@ -15,6 +28,8 @@ clks: ccm@4006b000 {
         compatible = "fsl,vf610-ccm";
         reg = <0x4006b000 0x1000>;
         #clock-cells = <1>;
+        clocks = <&sxosc>, <&fxosc>;
+        clock-names = "sxosc", "fxosc";
 };
 
 uart1: serial@40028000 {
diff --git a/Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt b/Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt
index 5c65eccd0e56..e8a35c71e947 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt
@@ -1,5 +1,5 @@
 Freescale SAHARA Cryptographic Accelerator included in some i.MX chips.
-Currently only i.MX27 is supported.
+Currently only i.MX27 and i.MX53 are supported.
 
 Required properties:
 - compatible : Should be "fsl,<soc>-sahara"
diff --git a/Documentation/devicetree/bindings/dma/atmel-xdma.txt b/Documentation/devicetree/bindings/dma/atmel-xdma.txt
new file mode 100644
index 000000000000..0eb2b3207e08
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/atmel-xdma.txt
@@ -0,0 +1,54 @@
+* Atmel Extensible Direct Memory Access Controller (XDMAC)
+
+* XDMA Controller
+Required properties:
+- compatible: Should be "atmel,<chip>-dma".
+  <chip> compatible description:
+  - sama5d4: first SoC adding the XDMAC
+- reg: Should contain DMA registers location and length.
+- interrupts: Should contain DMA interrupt.
+- #dma-cells: Must be <1>, used to represent the number of integer cells in
+the dmas property of client devices.
+  - The 1st cell specifies the channel configuration register:
+    - bit 13: SIF, source interface identifier, used to get the memory
+    interface identifier,
+    - bit 14: DIF, destination interface identifier, used to get the peripheral
+    interface identifier,
+    - bit 30-24: PERID, peripheral identifier.
+
+Example:
+
+dma1: dma-controller@f0004000 {
+        compatible = "atmel,sama5d4-dma";
+        reg = <0xf0004000 0x200>;
+        interrupts = <50 4 0>;
+        #dma-cells = <1>;
+};
+
+
+* DMA clients
+DMA clients connected to the Atmel XDMA controller must use the format
+described in the dma.txt file, using a one-cell specifier for each channel.
+The two cells in order are:
+1. A phandle pointing to the DMA controller.
+2. Channel configuration register. Configurable fields are:
+    - bit 13: SIF, source interface identifier, used to get the memory
+    interface identifier,
+    - bit 14: DIF, destination interface identifier, used to get the peripheral
+    interface identifier,
+  - bit 30-24: PERID, peripheral identifier.
+
+Example:
+
+i2c2: i2c@f8024000 {
+        compatible = "atmel,at91sam9x5-i2c";
+        reg = <0xf8024000 0x4000>;
+        interrupts = <34 4 6>;
+        dmas = <&dma1
+                (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+                 | AT91_XDMAC_DT_PERID(6))>,
+               <&dma1
+                (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+                | AT91_XDMAC_DT_PERID(7))>;
+        dma-names = "tx", "rx";
+};
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
index 4659fd952301..dc8d3aac1aa9 100644
--- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
@@ -48,6 +48,7 @@ The full ID of peripheral types can be found below.
         21      ESAI
         22      SSI Dual FIFO   (needs firmware ver >= 2)
         23      Shared ASRC
+        24      SAI
 
 The third cell specifies the transfer priority as below.
 
diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
index d75a9d767022..f8c3311b7153 100644
--- a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
+++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
@@ -1,7 +1,9 @@
 QCOM BAM DMA controller
 
 Required properties:
-- compatible: must contain "qcom,bam-v1.4.0" for MSM8974
+- compatible: must be one of the following:
+ * "qcom,bam-v1.4.0" for MSM8974, APQ8074 and APQ8084
+ * "qcom,bam-v1.3.0" for APQ8064, IPQ8064 and MSM8960
 - reg: Address range for DMA registers
 - interrupts: Should contain the one interrupt shared by all channels
 - #dma-cells: must be <1>, the cell in the dmas property of the client device
diff --git a/Documentation/devicetree/bindings/dma/sun6i-dma.txt b/Documentation/devicetree/bindings/dma/sun6i-dma.txt
index 3e145c1675b1..9cdcba24d7c3 100644
--- a/Documentation/devicetree/bindings/dma/sun6i-dma.txt
+++ b/Documentation/devicetree/bindings/dma/sun6i-dma.txt
@@ -4,7 +4,7 @@ This driver follows the generic DMA bindings defined in dma.txt.
 
 Required properties:
 
-- compatible:   Must be "allwinner,sun6i-a31-dma"
+- compatible:   Must be "allwinner,sun6i-a31-dma" or "allwinner,sun8i-a23-dma"
 - reg:          Should contain the registers base address and length
 - interrupts:   Should contain a reference to the interrupt used by this device
 - clocks:       Should contain a reference to the parent AHB clock
diff --git a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt
index 1405ed071bb4..e4c4d47f8137 100644
--- a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt
+++ b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt
@@ -25,7 +25,7 @@ Required child node properties:
 - compatible: It should be either "xlnx,axi-vdma-mm2s-channel" or
         "xlnx,axi-vdma-s2mm-channel".
 - interrupts: Should contain per channel VDMA interrupts.
-- xlnx,data-width: Should contain the stream data width, take values
+- xlnx,datawidth: Should contain the stream data width, take values
         {32,64...1024}.
 
 Optional child node properties:
diff --git a/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt b/Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt
index e75f0e549fff..e75f0e549fff 100644
--- a/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
+++ b/Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt
diff --git a/Documentation/devicetree/bindings/staging/imx-drm/hdmi.txt b/Documentation/devicetree/bindings/drm/imx/hdmi.txt
index 1b756cf9afb0..1b756cf9afb0 100644
--- a/Documentation/devicetree/bindings/staging/imx-drm/hdmi.txt
+++ b/Documentation/devicetree/bindings/drm/imx/hdmi.txt
diff --git a/Documentation/devicetree/bindings/staging/imx-drm/ldb.txt b/Documentation/devicetree/bindings/drm/imx/ldb.txt
index 443bcb6134d5..443bcb6134d5 100644
--- a/Documentation/devicetree/bindings/staging/imx-drm/ldb.txt
+++ b/Documentation/devicetree/bindings/drm/imx/ldb.txt
diff --git a/Documentation/devicetree/bindings/gpio/gpio-74xx-mmio.txt b/Documentation/devicetree/bindings/gpio/gpio-74xx-mmio.txt
new file mode 100644
index 000000000000..7bb1a9d60133
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-74xx-mmio.txt
@@ -0,0 +1,30 @@
+* 74XX MMIO GPIO driver
+
+Required properties:
+- compatible: Should contain one of the following:
+   "ti,741g125": for 741G125 (1-bit Input),
+   "ti,741g174": for 741G74 (1-bit Output),
+   "ti,742g125": for 742G125 (2-bit Input),
+   "ti,7474"   : for 7474 (2-bit Output),
+   "ti,74125"  : for 74125 (4-bit Input),
+   "ti,74175"  : for 74175 (4-bit Output),
+   "ti,74365"  : for 74365 (6-bit Input),
+   "ti,74174"  : for 74174 (6-bit Output),
+   "ti,74244"  : for 74244 (8-bit Input),
+   "ti,74273"  : for 74273 (8-bit Output),
+   "ti,741624" : for 741624 (16-bit Input),
+   "ti,7416374": for 7416374 (16-bit Output).
+- reg: Physical base address and length where IC resides.
+- gpio-controller: Marks the device node as a gpio controller.
+- #gpio-cells: Should be two. The first cell is the pin number and
+   the second cell is used to specify the GPIO polarity:
+    0 = Active High,
+    1 = Active Low.
+
+Example:
+        ctrl: gpio@30008004 {
+                compatible = "ti,74174";
+                reg = <0x30008004 0x1>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt b/Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt
index c306a2d0f2b1..f3332b9a8ed4 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt
@@ -57,6 +57,8 @@ Optional device specific properties:
         occurred on. If it is not set, the interrupt are only generated for the
         bank they belong to.
         On devices with only one interrupt output this property is useless.
+- microchip,irq-active-high: Sets the INTPOL flag in the IOCON register. This
+        configures the IRQ output polarity as active high.
 
 Example I2C (with interrupt):
 gpiom1: gpio@20 {
diff --git a/Documentation/devicetree/bindings/gpio/gpio-vf610.txt b/Documentation/devicetree/bindings/gpio/gpio-vf610.txt
new file mode 100644
index 000000000000..436cc99c6598
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-vf610.txt
@@ -0,0 +1,55 @@
+* Freescale VF610 PORT/GPIO module
+
+The Freescale PORT/GPIO modules are two adjacent modules providing GPIO
+functionality. Each pair serves 32 GPIOs. The VF610 has 5 instances of
+each, and each PORT module has its own interrupt.
+
+Required properties for GPIO node:
+- compatible : Should be "fsl,<soc>-gpio", currently "fsl,vf610-gpio"
+- reg : The first reg tuple represents the PORT module, the second tuple
+  the GPIO module.
+- interrupts : Should be the port interrupt shared by all 32 pins.
+- gpio-controller : Marks the device node as a gpio controller.
+- #gpio-cells : Should be two. The first cell is the pin number and
+  the second cell is used to specify the gpio polarity:
+      0 = active high
+      1 = active low
+- interrupt-controller: Marks the device node as an interrupt controller.
+- #interrupt-cells : Should be 2.  The first cell is the GPIO number.
+  The second cell bits[3:0] is used to specify trigger type and level flags:
+      1 = low-to-high edge triggered.
+      2 = high-to-low edge triggered.
+      4 = active high level-sensitive.
+      8 = active low level-sensitive.
+
+Note: Each GPIO port should have an alias correctly numbered in "aliases"
+node.
+
+Examples:
+
+aliases {
+        gpio0 = &gpio1;
+        gpio1 = &gpio2;
+};
+
+gpio1: gpio@40049000 {
+        compatible = "fsl,vf610-gpio";
+        reg = <0x40049000 0x1000 0x400ff000 0x40>;
+        interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+        gpio-controller;
+        #gpio-cells = <2>;
+        interrupt-controller;
+        #interrupt-cells = <2>;
+        gpio-ranges = <&iomuxc 0 0 32>;
+};
+
+gpio2: gpio@4004a000 {
+        compatible = "fsl,vf610-gpio";
+        reg = <0x4004a000 0x1000 0x400ff040 0x40>;
+        interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+        gpio-controller;
+        #gpio-cells = <2>;
+        interrupt-controller;
+        #interrupt-cells = <2>;
+        gpio-ranges = <&iomuxc 0 32 32>;
+};
diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt
index 3fb8f53071b8..b9bd1d64cfa6 100644
--- a/Documentation/devicetree/bindings/gpio/gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio.txt
@@ -13,13 +13,22 @@ properties, each containing a 'gpio-list':
         gpio-specifier : Array of #gpio-cells specifying specific gpio
                          (controller specific)
 
-GPIO properties should be named "[<name>-]gpios". The exact
-meaning of each gpios property must be documented in the device tree
-binding for each device.
+GPIO properties should be named "[<name>-]gpios", with <name> being the purpose
+of this GPIO for the device. While a non-existent <name> is considered valid
+for compatibility reasons (resolving to the "gpios" property), it is not allowed
+for new bindings.
 
-For example, the following could be used to describe GPIO pins used
-as chip select lines; with chip selects 0, 1 and 3 populated, and chip
-select 2 left empty:
+GPIO properties can contain one or more GPIO phandles, but only in exceptional
+cases should they contain more than one. If your device uses several GPIOs with
+distinct functions, reference each of them under its own property, giving it a
+meaningful name. The only case where an array of GPIOs is accepted is when
+several GPIOs serve the same function (e.g. a parallel data line).
+
+The exact purpose of each gpios property must be documented in the device tree
+binding of the device.
+
+The following example could be used to describe GPIO pins used as device enable
+and bit-banged data signals:
 
         gpio1: gpio1 {
                 gpio-controller
@@ -30,10 +39,12 @@ select 2 left empty:
                  #gpio-cells = <1>;
         };
         [...]
-         chipsel-gpios = <&gpio1 12 0>,
-                         <&gpio1 13 0>,
-                         <0>, /* holes are permitted, means no GPIO 2 */
-                         <&gpio2 2>;
+
+        enable-gpios = <&gpio2 2>;
+        data-gpios = <&gpio1 12 0>,
+                     <&gpio1 13 0>,
+                     <&gpio1 14 0>,
+                     <&gpio1 15 0>;
 
 Note that gpio-specifier length is controller dependent.  In the
 above example, &gpio1 uses 2 cells to specify a gpio, while &gpio2
@@ -42,16 +53,17 @@ only uses one.
 gpio-specifier may encode: bank, pin position inside the bank,
 whether pin is open-drain and whether pin is logically inverted.
 Exact meaning of each specifier cell is controller specific, and must
-be documented in the device tree binding for the device.
+be documented in the device tree binding for the device. Use the macros
+defined in include/dt-bindings/gpio/gpio.h whenever possible:
 
 Example of a node using GPIOs:
 
         node {
-                gpios = <&qe_pio_e 18 0>;
+                enable-gpios = <&qe_pio_e 18 GPIO_ACTIVE_HIGH>;
         };
 
-In this example gpio-specifier is "18 0" and encodes GPIO pin number,
-and GPIO flags as accepted by the "qe_pio_e" gpio-controller.
+GPIO_ACTIVE_HIGH is 0, so in this example gpio-specifier is "18 0" and encodes
+GPIO pin number, and GPIO flags as accepted by the "qe_pio_e" gpio-controller.
 
 1.1) GPIO specifier best practices
 ----------------------------------
diff --git a/Documentation/devicetree/bindings/gpio/pl061-gpio.txt b/Documentation/devicetree/bindings/gpio/pl061-gpio.txt
index a2c416bcbccc..89058d375b7c 100644
--- a/Documentation/devicetree/bindings/gpio/pl061-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/pl061-gpio.txt
@@ -7,4 +7,4 @@ Required properties:
   - bit 0 specifies polarity (0 for normal, 1 for inverted)
 - gpio-controller : Marks the device node as a GPIO controller.
 - interrupts : Interrupt mapping for GPIO IRQ.
-
+- gpio-ranges : Interaction with the PINCTRL subsystem.
diff --git a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
index 941a26aa4322..38fb86f28ba2 100644
--- a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
+++ b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
@@ -6,7 +6,9 @@ Required Properties:
     - "renesas,gpio-r8a7778": for R8A7778 (R-Mobile M1) compatible GPIO controller.
     - "renesas,gpio-r8a7779": for R8A7779 (R-Car H1) compatible GPIO controller.
     - "renesas,gpio-r8a7790": for R8A7790 (R-Car H2) compatible GPIO controller.
-    - "renesas,gpio-r8a7791": for R8A7791 (R-Car M2) compatible GPIO controller.
+    - "renesas,gpio-r8a7791": for R8A7791 (R-Car M2-W) compatible GPIO controller.
+    - "renesas,gpio-r8a7793": for R8A7793 (R-Car M2-N) compatible GPIO controller.
+    - "renesas,gpio-r8a7794": for R8A7794 (R-Car E2) compatible GPIO controller.
     - "renesas,gpio-rcar": for generic R-Car GPIO controller.
 
   - reg: Base address and length of each memory resource used by the GPIO
diff --git a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
index b48f4ef31d93..4c32ef0b7db8 100644
--- a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
+++ b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -191,6 +191,8 @@ of the following host1x client modules:
   - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection
   - nvidia,edid: supplies a binary EDID blob
   - nvidia,panel: phandle of a display panel
+  - nvidia,ganged-mode: contains a phandle to a second DSI controller to gang
+    up with in order to support up to 8 data lanes
 
 - sor: serial output resource
 
diff --git a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt b/Documentation/devicetree/bindings/gpu/st,stih4xx.txt
index 2d150c311a05..c99eb34e640b 100644
--- a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt
+++ b/Documentation/devicetree/bindings/gpu/st,stih4xx.txt
@@ -68,7 +68,7 @@ STMicroelectronics stih4xx platforms
     number of clocks may depend of the SoC type.
   - clock-names: names of the clocks listed in clocks property in the same
     order.
-  - hdmi,hpd-gpio: gpio id to detect if an hdmi cable is plugged or not.
+  - ddc: phandle of an I2C controller used for DDC EDID probing
 
 sti-hda:
   Required properties:
@@ -83,6 +83,22 @@ sti-hda:
   - clock-names: names of the clocks listed in clocks property in the same
     order.
 
+sti-hqvdp:
+  must be a child of sti-display-subsystem
+  Required properties:
+  - compatible: "st,stih<chip>-hqvdp"
+  - reg: Physical base address of the IP registers and length of memory mapped region.
+  - clocks: from common clock binding: handle hardware IP needed clocks, the
+    number of clocks may depend of the SoC type.
+    See ../clocks/clock-bindings.txt for details.
+  - clock-names: names of the clocks listed in clocks property in the same
+    order.
+  - resets: resets to be used by the device
+    See ../reset/reset.txt for details.
+  - reset-names: names of the resets listed in resets property in the same
+    order.
+  - st,vtg: phandle on vtg main device node.
+
 Example:
 
 / {
@@ -173,7 +189,6 @@ Example:
                                 interrupt-names = "irq";
                                 clock-names     = "pix", "tmds", "phy", "audio";
                                 clocks          = <&clockgen_c_vcc CLK_S_PIX_HDMI>, <&clockgen_c_vcc CLK_S_TMDS_HDMI>, <&clockgen_c_vcc CLK_S_HDMI_REJECT_PLL>, <&clockgen_b1 CLK_S_PCM_0>;
-                                hdmi,hpd-gpio   = <&PIO2 5>;
                         };
 
                         sti-hda@fe85a000 {
@@ -184,6 +199,16 @@ Example:
                                 clocks          = <&clockgen_c_vcc CLK_S_PIX_HD>, <&clockgen_c_vcc CLK_S_HDDAC>;
                         };
                 };
+
+                sti-hqvdp@9c000000 {
+                                compatible      = "st,stih407-hqvdp";
+                                reg             = <0x9C00000 0x100000>;
+                                clock-names     = "hqvdp", "pix_main";
+                                clocks          = <&clk_s_c0_flexgen CLK_MAIN_DISP>, <&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>;
+                                reset-names     = "hqvdp";
+                                resets          = <&softreset STIH407_HDQVDP_SOFTRESET>;
+                                st,vtg          = <&vtg_main>;
+                        };
         };
         ...
 };
diff --git a/Documentation/devicetree/bindings/hwmon/ltc2978.txt b/Documentation/devicetree/bindings/hwmon/ltc2978.txt
new file mode 100644
index 000000000000..ed2f09dc2483
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwmon/ltc2978.txt
@@ -0,0 +1,39 @@
+ltc2978
+
+Required properties:
+- compatible: should contain one of:
+  * "lltc,ltc2974"
+  * "lltc,ltc2977"
+  * "lltc,ltc2978"
+  * "lltc,ltc3880"
+  * "lltc,ltc3883"
+  * "lltc,ltm4676"
+- reg: I2C slave address
+
+Optional properties:
+- regulators: A node that houses a sub-node for each regulator controlled by
+  the device. Each sub-node is identified using the node's name, with valid
+  values listed below. The content of each sub-node is defined by the
+  standard binding for regulators; see regulator.txt.
+
+Valid names of regulators depend on number of supplies supported per device:
+  * ltc2974 : vout0 - vout3
+  * ltc2977 : vout0 - vout7
+  * ltc2978 : vout0 - vout7
+  * ltc3880 : vout0 - vout1
+  * ltc3883 : vout0
+  * ltm4676 : vout0 - vout1
+
+Example:
+ltc2978@5e {
+        compatible = "lltc,ltc2978";
+        reg = <0x5e>;
+        regulators {
+                vout0 {
+                        regulator-name = "FPGA-2.5V";
+                };
+                vout2 {
+                        regulator-name = "FPGA-1.5V";
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/hwrng/atmel-trng.txt b/Documentation/devicetree/bindings/hwrng/atmel-trng.txt
new file mode 100644
index 000000000000..4ac5aaa2d024
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwrng/atmel-trng.txt
@@ -0,0 +1,16 @@
+Atmel TRNG (True Random Number Generator) block
+
+Required properties:
+- compatible : Should be "atmel,at91sam9g45-trng"
+- reg : Offset and length of the register set of this block
+- interrupts : the interrupt number for the TRNG block
+- clocks: should contain the TRNG clk source
+
+Example:
+
+trng@fffcc000 {
+        compatible = "atmel,at91sam9g45-trng";
+        reg = <0xfffcc000 0x4000>;
+        interrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>;
+        clocks = <&trng_clk>;
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-designware.txt b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
index 5199b0c8cf7a..fee26dc3e858 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-designware.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
@@ -14,10 +14,10 @@ Optional properties :
  - i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds.
    This option is only supported in hardware blocks version 1.11a or newer.
 
- - i2c-scl-falling-time : should contain the SCL falling time in nanoseconds.
+ - i2c-scl-falling-time-ns : should contain the SCL falling time in nanoseconds.
    This value which is by default 300ns is used to compute the tLOW period.
 
- - i2c-sda-falling-time : should contain the SDA falling time in nanoseconds.
+ - i2c-sda-falling-time-ns : should contain the SDA falling time in nanoseconds.
    This value which is by default 300ns is used to compute the tHIGH period.
 
 Example :
diff --git a/Documentation/devicetree/bindings/i2c/i2c-img-scb.txt b/Documentation/devicetree/bindings/i2c/i2c-img-scb.txt
new file mode 100644
index 000000000000..b6461602dca5
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-img-scb.txt
@@ -0,0 +1,26 @@
+IMG Serial Control Bus (SCB) I2C Controller
+
+Required Properties:
+- compatible: "img,scb-i2c"
+- reg: Physical base address and length of controller registers
+- interrupts: Interrupt number used by the controller
+- clocks : Should contain a clock specifier for each entry in clock-names
+- clock-names : Should contain the following entries:
+                "scb", for the SCB core clock.
+                "sys", for the system clock.
+- clock-frequency: The I2C bus frequency in Hz
+- #address-cells: Should be <1>
+- #size-cells: Should be <0>
+
+Example:
+
+i2c@18100000 {
+        compatible = "img,scb-i2c";
+        reg = <0x18100000 0x200>;
+        interrupts = <GIC_SHARED 2 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&i2c0_clk>, <&system_clk>;
+        clock-names = "scb", "sys";
+        clock-frequency = <400000>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx.txt b/Documentation/devicetree/bindings/i2c/i2c-imx.txt
index 4a8513e44740..52d37fd8d3e5 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-imx.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-imx.txt
@@ -11,6 +11,8 @@ Required properties:
 Optional properties:
 - clock-frequency : Constains desired I2C/HS-I2C bus clock frequency in Hz.
   The absence of the propoerty indicates the default frequency 100 kHz.
+- dmas: A list of two dma specifiers, one for each entry in dma-names.
+- dma-names: should contain "tx" and "rx".
 
 Examples:
 
@@ -26,3 +28,12 @@ i2c@70038000 { /* HS-I2C on i.MX51 */
         interrupts = <64>;
         clock-frequency = <400000>;
 };
+
+i2c0: i2c@40066000 { /* i2c0 on vf610 */
+        compatible = "fsl,vf610-i2c";
+        reg = <0x40066000 0x1000>;
+        interrupts =<0 71 0x04>;
+        dmas = <&edma0 0 50>,
+                <&edma0 0 51>;
+        dma-names = "rx","tx";
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-meson.txt b/Documentation/devicetree/bindings/i2c/i2c-meson.txt
new file mode 100644
index 000000000000..682f9a6f766e
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-meson.txt
@@ -0,0 +1,24 @@
+Amlogic Meson I2C controller
+
+Required properties:
+ - compatible: must be "amlogic,meson6-i2c"
+ - reg: physical address and length of the device registers
+ - interrupts: a single interrupt specifier
+ - clocks: clock for the device
+ - #address-cells: should be <1>
+ - #size-cells: should be <0>
+
+Optional properties:
+- clock-frequency: the desired I2C bus clock frequency in Hz; in
+  absence of this property the default value is used (100 kHz).
+
+Examples:
+
+        i2c@c8100500 {
+                compatible = "amlogic,meson6-i2c";
+                reg = <0xc8100500 0x20>;
+                interrupts = <0 92 1>;
+                clocks = <&clk81>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
diff --git a/Documentation/devicetree/bindings/i2c/i2c-opal.txt b/Documentation/devicetree/bindings/i2c/i2c-opal.txt
new file mode 100644
index 000000000000..12bc61465ee5
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-opal.txt
@@ -0,0 +1,37 @@
+Device-tree bindings for I2C OPAL driver
+----------------------------------------
+
+Most of the device node and properties layout is specific to the firmware and
+used by the firmware itself for configuring the port. From the linux
+perspective, the properties of use are "ibm,port-name" and "ibm,opal-id".
+
+Required properties:
+
+- reg: Port-id within a given master
+- compatible: must be "ibm,opal-i2c"
+- ibm,opal-id: Refers to a specific bus and used to identify it when calling
+               the relevant OPAL functions.
+- bus-frequency: Operating frequency of the i2c bus (in HZ). Informational for
+                 linux, used by the FW though.
+
+Optional properties:
+- ibm,port-name: Firmware provides this name that uniquely identifies the i2c
+                 port.
+
+The node contains a number of other properties that are used by the FW itself
+and depend on the specific hardware implementation. The example below depicts
+a P8 on-chip bus.
+
+Example:
+
+i2c-bus@0 {
+        reg = <0x0>;
+        bus-frequency = <0x61a80>;
+        compatible = "ibm,power8-i2c-port", "ibm,opal-i2c";
+        ibm,opal-id = <0x1>;
+        ibm,port-name = "p8_00000000_e1p0";
+        #address-cells = <0x1>;
+        phandle = <0x10000006>;
+        #size-cells = <0x0>;
+        linux,phandle = <0x10000006>;
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt b/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
index 278de8e64bbf..89b3250f049b 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
@@ -32,6 +32,7 @@ Optional properties:
     specified, default value is 0.
   - samsung,i2c-max-bus-freq: Desired frequency in Hz of the bus. If not
     specified, the default value in Hz is 100000.
+  - samsung,sysreg-phandle - handle to syscon used to control the system registers
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt b/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
index d2153ce36fa8..2bfc6e7ed094 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
@@ -2,6 +2,15 @@ Device tree configuration for Renesas IIC (sh_mobile) driver
 
 Required properties:
 - compatible      : "renesas,iic-<soctype>". "renesas,rmobile-iic" as fallback
+                     Examples with soctypes are:
+                        - "renesas,iic-r8a73a4" (R-Mobile APE6)
+                        - "renesas,iic-r8a7740" (R-Mobile A1)
+                        - "renesas,iic-r8a7790" (R-Car H2)
+                        - "renesas,iic-r8a7791" (R-Car M2-W)
+                        - "renesas,iic-r8a7792" (R-Car V2H)
+                        - "renesas,iic-r8a7793" (R-Car M2-N)
+                        - "renesas,iic-r8a7794" (R-Car E2)
+                        - "renesas,iic-sh73a0" (SH-Mobile AG5)
 - reg             : address start and address range size of device
 - interrupts      : interrupt of device
 - clocks          : clock for device
@@ -10,6 +19,11 @@ Required properties:
 
 Optional properties:
 - clock-frequency : frequency of bus clock in Hz. Default 100kHz if unset.
+- dmas            : Must contain a list of two references to DMA
+                    specifiers, one for transmission, and one for
+                    reception.
+- dma-names       : Must contain a list of two DMA names, "tx" and "rx".
+
 
 Pinctrl properties might be needed, too. See there.
 
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index fbde415078e6..9f4e3824e71e 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -17,6 +17,9 @@ adi,adt7473		+/-1C TDM Extended Temp Range I.C
 adi,adt7475             +/-1C TDM Extended Temp Range I.C
 adi,adt7476             +/-1C TDM Extended Temp Range I.C
 adi,adt7490             +/-1C TDM Extended Temp Range I.C
+adi,adxl345             Three-Axis Digital Accelerometer
+adi,adxl346             Three-Axis Digital Accelerometer
+adi,adxl34x             Three-Axis Digital Accelerometer
 at,24c08                i2c serial eeprom  (24cxx)
 atmel,24c00             i2c serial eeprom  (24cxx)
 atmel,24c01             i2c serial eeprom  (24cxx)
@@ -56,6 +59,8 @@ gmt,g751		G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire In
 infineon,slb9635tt      Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
 infineon,slb9645tt      Infineon SLB9645 I2C TPM (new protocol, max 400khz)
 isl,isl12057            Intersil ISL12057 I2C RTC Chip
+isil,isl29028           (deprecated, use isl)
+isl,isl29028            Intersil ISL29028 Ambient Light and Proximity Sensor
 maxim,ds1050            5 Bit Programmable, Pulse-Width Modulator
 maxim,max1237           Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
 maxim,max6625           9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
@@ -74,7 +79,12 @@ ovti,ov5642		OV5642: Color CMOS QSXGA (5-megapixel) Image Sensor with OmniBSI an
 pericom,pt7c4338        Real-time Clock Module
 plx,pex8648             48-Lane, 12-Port PCI Express Gen 2 (5.0 GT/s) Switch
 ramtron,24c64           i2c serial eeprom  (24cxx)
+ricoh,r2025sd           I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
+ricoh,r2221tl           I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
 ricoh,rs5c372a          I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
+ricoh,rs5c372b          I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
+ricoh,rv5c386           I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
+ricoh,rv5c387a          I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
 samsung,24ad0xd1        S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
 sii,s35390a             2-wire CMOS real-time clock
 st-micro,24c256         i2c serial eeprom  (24cxx)
diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.txt b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.txt
new file mode 100644
index 000000000000..4e36d6e2f7b6
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.txt
@@ -0,0 +1,46 @@
+Qualcomm's SPMI PMIC current ADC
+
+QPNP PMIC current ADC (IADC) provides interface to clients to read current.
+A 16 bit ADC is used for current measurements. IADC can measure the current
+through an external resistor (channel 1) or internal (built-in) resistor
+(channel 0). When using an external resistor it is to be described by
+qcom,external-resistor-micro-ohms property.
+
+IADC node:
+
+- compatible:
+    Usage: required
+    Value type: <string>
+    Definition: Should contain "qcom,spmi-iadc".
+
+- reg:
+    Usage: required
+    Value type: <prop-encoded-array>
+    Definition: IADC base address and length in the SPMI PMIC register map
+
+- interrupts:
+    Usage: optional
+    Value type: <prop-encoded-array>
+    Definition: End of ADC conversion.
+
+- qcom,external-resistor-micro-ohms:
+    Usage: optional
+    Value type: <u32>
+    Definition: Sense resister value in micro Ohm.
+                If not defined value of 10000 micro Ohms will be used.
+
+Example:
+        /* IADC node */
+        pmic_iadc: iadc@3600 {
+                compatible = "qcom,spmi-iadc";
+                reg = <0x3600 0x100>;
+                interrupts = <0x0 0x36 0x0 IRQ_TYPE_EDGE_RISING>;
+                qcom,external-resistor-micro-ohms = <10000>;
+                #io-channel-cells  = <1>;
+        };
+
+        /* IIO client node */
+        bat {
+                io-channels = <&pmic_iadc  0>;
+                io-channel-names = "iadc";
+        };
diff --git a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt
index 5d3ec1df226d..a9a5fe19ff2a 100644
--- a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt
@@ -1,7 +1,7 @@
 Rockchip Successive Approximation Register (SAR) A/D Converter bindings
 
 Required properties:
-- compatible: Should be "rockchip,saradc"
+- compatible: Should be "rockchip,saradc" or "rockchip,rk3066-tsadc"
 - reg: physical base address of the controller and length of memory mapped
        region.
 - interrupts: The interrupt number to the cpu. The interrupt specifier format
diff --git a/Documentation/devicetree/bindings/input/cap1106.txt b/Documentation/devicetree/bindings/input/cap11xx.txt
index 4b463904cba0..7d0a3009771b 100644
--- a/Documentation/devicetree/bindings/input/cap1106.txt
+++ b/Documentation/devicetree/bindings/input/cap11xx.txt
@@ -1,14 +1,16 @@
-Device tree bindings for Microchip CAP1106, 6 channel capacitive touch sensor
+Device tree bindings for Microchip CAP11xx based capacitive touch sensors
 
-The node for this driver must be a child of a I2C controller node, as the
+The node for this device must be a child of a I2C controller node, as the
 device communication via I2C only.
 
 Required properties:
 
-        compatible:             Must be "microchip,cap1106"
+        compatible:             Must contain one of:
+                                        "microchip,cap1106"
+                                        "microchip,cap1126"
+                                        "microchip,cap1188"
 
         reg:                    The I2C slave address of the device.
-                                Only 0x28 is valid.
 
         interrupts:             Property describing the interrupt line the
                                 device's ALERT#/CM_IRQ# pin is connected to.
@@ -26,6 +28,10 @@ Optional properties:
                                 Valid values are 1, 2, 4, and 8.
                                 By default, a gain of 1 is set.
 
+        microchip,irq-active-high:      By default the interrupt pin is active low
+                                open drain. This property allows using the active
+                                high push-pull output.
+
         linux,keycodes:         Specifies an array of numeric keycode values to
                                 be used for the channels. If this property is
                                 omitted, KEY_A, KEY_B, etc are used as
@@ -43,11 +49,11 @@ i2c_controller {
                 autorepeat;
                 microchip,sensor-gain = <2>;
 
-                linux,keycodes = <103           /* KEY_UP */
-                                  106           /* KEY_RIGHT */
-                                  108           /* KEY_DOWN */
-                                  105           /* KEY_LEFT */
-                                  109           /* KEY_PAGEDOWN */
-                                  104>;         /* KEY_PAGEUP */
+                linux,keycodes = <103>,         /* KEY_UP */
+                                 <106>,         /* KEY_RIGHT */
+                                 <108>,         /* KEY_DOWN */
+                                 <105>,         /* KEY_LEFT */
+                                 <109>,         /* KEY_PAGEDOWN */
+                                 <104>;         /* KEY_PAGEUP */
         };
 }
diff --git a/Documentation/devicetree/bindings/input/elan_i2c.txt b/Documentation/devicetree/bindings/input/elan_i2c.txt
new file mode 100644
index 000000000000..ee3242c4ba67
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/elan_i2c.txt
@@ -0,0 +1,34 @@
+Elantech I2C Touchpad
+
+Required properties:
+- compatible: must be "elan,ekth3000".
+- reg: I2C address of the chip.
+- interrupt-parent: a phandle for the interrupt controller (see interrupt
+  binding[0]).
+- interrupts: interrupt to which the chip is connected (see interrupt
+  binding[0]).
+
+Optional properties:
+- wakeup-source: touchpad can be used as a wakeup source.
+- pinctrl-names: should be "default" (see pinctrl binding [1]).
+- pinctrl-0: a phandle pointing to the pin settings for the device (see
+  pinctrl binding [1]).
+- vcc-supply: a phandle for the regulator supplying 3.3V power.
+
+[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+
+Example:
+        &i2c1 {
+                /* ... */
+
+                touchpad@15 {
+                        compatible = "elan,ekth3000";
+                        reg = <0x15>;
+                        interrupt-parent = <&gpio4>;
+                        interrupts = <0x0 IRQ_TYPE_EDGE_FALLING>;
+                        wakeup-source;
+                };
+
+                /* ... */
+        };
diff --git a/Documentation/devicetree/bindings/input/elants_i2c.txt b/Documentation/devicetree/bindings/input/elants_i2c.txt
new file mode 100644
index 000000000000..a765232e6446
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/elants_i2c.txt
@@ -0,0 +1,33 @@
+Elantech I2C Touchscreen
+
+Required properties:
+- compatible: must be "elan,ekth3500".
+- reg: I2C address of the chip.
+- interrupt-parent: a phandle for the interrupt controller (see interrupt
+  binding[0]).
+- interrupts: interrupt to which the chip is connected (see interrupt
+  binding[0]).
+
+Optional properties:
+- wakeup-source: touchscreen can be used as a wakeup source.
+- pinctrl-names: should be "default" (see pinctrl binding [1]).
+- pinctrl-0: a phandle pointing to the pin settings for the device (see
+  pinctrl binding [1]).
+
+[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+
+Example:
+        &i2c1 {
+                /* ... */
+
+                touchscreen@10 {
+                        compatible = "elan,ekth3500";
+                        reg = <0x10>;
+                        interrupt-parent = <&gpio4>;
+                        interrupts = <0x0 IRQ_TYPE_EDGE_FALLING>;
+                        wakeup-source;
+                };
+
+                /* ... */
+        };
diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt
index 5c2c02140a62..a4a38fcf2ed6 100644
--- a/Documentation/devicetree/bindings/input/gpio-keys.txt
+++ b/Documentation/devicetree/bindings/input/gpio-keys.txt
@@ -10,10 +10,13 @@ Optional properties:
 Each button (key) is represented as a sub-node of "gpio-keys":
 Subnode properties:
 
-        - gpios: OF device-tree gpio specification.
         - label: Descriptive name of the key.
         - linux,code: Keycode to emit.
 
+Required mutual exclusive subnode-properties:
+        - gpios: OF device-tree gpio specification.
+        - interrupts: the interrupt line for that input
+
 Optional subnode-properties:
         - linux,input-type: Specify event type this button/key generates.
           If not specified defaults to <1> == EV_KEY.
@@ -33,4 +36,9 @@ Example nodes:
                                 linux,code = <103>;
                                 gpios = <&gpio1 0 1>;
                         };
+                        button@22 {
+                                label = "GPIO Key DOWN";
+                                linux,code = <108>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                        };
                         ...
diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt
index ff812a8a82bc..bae1f2187226 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt
@@ -13,7 +13,12 @@ Such an interrupt controller has the following hardware design:
   or if they will output an interrupt signal at this 2nd level interrupt
   controller, in particular for UARTs
 
-- not all 32-bits within the interrupt controller actually map to an interrupt
+- typically has one 32-bit enable word and one 32-bit status word, but on
+  some hardware may have more than one enable/status pair
+
+- no atomic set/clear operations
+
+- not all bits within the interrupt controller actually map to an interrupt
 
 The typical hardware layout for this controller is represented below:
 
@@ -48,7 +53,9 @@ The typical hardware layout for this controller is represented below:
 Required properties:
 
 - compatible: should be "brcm,bcm7120-l2-intc"
-- reg: specifies the base physical address and size of the registers
+- reg: specifies the base physical address and size of the registers;
+  multiple pairs may be specified, with the first pair handling IRQ offsets
+  0..31 and the second pair handling 32..63
 - interrupt-controller: identifies the node as an interrupt controller
 - #interrupt-cells: specifies the number of cells needed to encode an interrupt
   source, should be 1.
@@ -59,18 +66,21 @@ Required properties:
 - brcm,int-map-mask: 32-bits bit mask describing how many and which interrupts
   are wired to this 2nd level interrupt controller, and how they match their
   respective interrupt parents. Should match exactly the number of interrupts
-  specified in the 'interrupts' property.
+  specified in the 'interrupts' property, multiplied by the number of
+  enable/status register pairs implemented by this controller.  For
+  multiple parent IRQs with multiple enable/status words, this looks like:
+  <irq0_w0 irq0_w1 irq1_w0 irq1_w1 ...>
 
 Optional properties:
 
 - brcm,irq-can-wake: if present, this means the L2 controller can be used as a
   wakeup source for system suspend/resume.
 
-- brcm,int-fwd-mask: if present, a 32-bits bit mask to configure for the
-  interrupts which have a mux gate, typically UARTs. Setting these bits will
-  make their respective interrupts outputs bypass this 2nd level interrupt
-  controller completely, it completely transparent for the interrupt controller
-  parent
+- brcm,int-fwd-mask: if present, a bit mask to configure the interrupts which
+  have a mux gate, typically UARTs. Setting these bits will make their
+  respective interrupt outputs bypass this 2nd level interrupt controller
+  completely; it is completely transparent for the interrupt controller
+  parent. This should have one 32-bit word per enable/status pair.
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
index ce6a1a072028..8a3c40829899 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
@@ -30,10 +30,6 @@ should only be used when a device has multiple interrupt parents.
   Example:
         interrupts-extended = <&intc1 5 1>, <&intc2 1 0>;
 
-A device node may contain either "interrupts" or "interrupts-extended", but not
-both. If both properties are present, then the operating system should log an
-error and use only the data in "interrupts".
-
 2) Interrupt controller nodes
 -----------------------------
 
diff --git a/Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt b/Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt
new file mode 100644
index 000000000000..5a65478e5d40
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt
@@ -0,0 +1,55 @@
+MIPS Global Interrupt Controller (GIC)
+
+The MIPS GIC routes external interrupts to individual VPEs and IRQ pins.
+It also supports local (per-processor) interrupts and software-generated
+interrupts which can be used as IPIs.  The GIC also includes a free-running
+global timer, per-CPU count/compare timers, and a watchdog.
+
+Required properties:
+- compatible : Should be "mti,gic".
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode an
+  interrupt specifier.  Should be 3.
+  - The first cell is the type of interrupt, local or shared.
+    See <include/dt-bindings/interrupt-controller/mips-gic.h>.
+  - The second cell is the GIC interrupt number.
+  - The third cell encodes the interrupt flags.
+    See <include/dt-bindings/interrupt-controller/irq.h> for a list of valid
+    flags.
+
+Optional properties:
+- reg : Base address and length of the GIC registers.  If not present,
+  the base address reported by the hardware GCR_GIC_BASE will be used.
+- mti,reserved-cpu-vectors : Specifies the list of CPU interrupt vectors
+  to which the GIC may not route interrupts.  Valid values are 2 - 7.
+  This property is ignored if the CPU is started in EIC mode.
+
+Required properties for timer sub-node:
+- compatible : Should be "mti,gic-timer".
+- interrupts : Interrupt for the GIC local timer.
+- clock-frequency : Clock frequency at which the GIC timers operate.
+
+Example:
+
+        gic: interrupt-controller@1bdc0000 {
+                compatible = "mti,gic";
+                reg = <0x1bdc0000 0x20000>;
+
+                interrupt-controller;
+                #interrupt-cells = <3>;
+
+                mti,reserved-cpu-vectors = <7>;
+
+                timer {
+                        compatible = "mti,gic-timer";
+                        interrupts = <GIC_LOCAL 1 IRQ_TYPE_NONE>;
+                        clock-frequency = <50000000>;
+                };
+        };
+
+        uart@18101400 {
+                ...
+                interrupt-parent = <&gic>;
+                interrupts = <GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH>;
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt b/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt
new file mode 100644
index 000000000000..9a55ac3735e5
--- /dev/null
+++ b/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt
@@ -0,0 +1,26 @@
+Rockchip IOMMU
+==============
+
+A Rockchip DRM iommu translates io virtual addresses to physical addresses for
+its master device.  Each slave device is bound to a single master device, and
+shares its clocks, power domain and irq.
+
+Required properties:
+- compatible      : Should be "rockchip,iommu"
+- reg             : Address space for the configuration registers
+- interrupts      : Interrupt specifier for the IOMMU instance
+- interrupt-names : Interrupt name for the IOMMU instance
+- #iommu-cells    : Should be <0>.  This indicates the iommu is a
+                    "single-master" device, and needs no additional information
+                    to associate with its master device.  See:
+                    Documentation/devicetree/bindings/iommu/iommu.txt
+
+Example:
+
+        vopl_mmu: iommu@ff940300 {
+                compatible = "rockchip,iommu";
+                reg = <0xff940300 0x100>;
+                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "vopl_mmu";
+                #iommu-cells = <0>;
+        };
diff --git a/Documentation/devicetree/bindings/leds/leds-lp8860.txt b/Documentation/devicetree/bindings/leds/leds-lp8860.txt
new file mode 100644
index 000000000000..aad38dd94d4b
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/leds-lp8860.txt
@@ -0,0 +1,29 @@
+* Texas Instruments - lp8860 4-Channel LED Driver
+
+The LP8860-Q1 is an high-efficiency LED
+driver with boost controller. It has 4 high-precision
+current sinks that can be controlled by a PWM input
+signal, a SPI/I2C master, or both.
+
+Required properties:
+        - compatible:
+                "ti,lp8860"
+        - reg -  I2C slave address
+        - label - Used for naming LEDs
+
+Optional properties:
+        - enable-gpio - gpio pin to enable/disable the device.
+        - supply - "vled" - LED supply
+
+Example:
+
+leds: leds@6 {
+        compatible = "ti,lp8860";
+        reg = <0x2d>;
+        label = "display_cluster";
+        enable-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+        vled-supply = <&vbatt>;
+}
+
+For more product information please see the link below:
+http://www.ti.com/product/lp8860-q1
diff --git a/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt b/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
index 48edc4b92afb..d1a043339c11 100644
--- a/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
+++ b/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
@@ -43,6 +43,9 @@ Required properties:
                         device. The format is dependent on which interrupt
                         controller the OMAP device uses
 - ti,hwmods:            Name of the hwmod associated with the mailbox
+- #mbox-cells:          Common mailbox binding property to identify the number
+                        of cells required for the mailbox specifier. Should be
+                        1
 - ti,mbox-num-users:    Number of targets (processor devices) that the mailbox
                         device can interrupt
 - ti,mbox-num-fifos:    Number of h/w fifo queues within the mailbox IP block
@@ -72,6 +75,18 @@ data that represent the following:
     Cell #3 (usr_id)  - mailbox user id for identifying the interrupt line
                         associated with generating a tx/rx fifo interrupt.
 
+Mailbox Users:
+==============
+A device needing to communicate with a target processor device should specify
+them using the common mailbox binding properties, "mboxes" and the optional
+"mbox-names" (please see Documentation/devicetree/bindings/mailbox/mailbox.txt
+for details). Each value of the mboxes property should contain a phandle to the
+mailbox controller device node and an args specifier that will be the phandle to
+the intended sub-mailbox child node to be used for communication. The equivalent
+"mbox-names" property value can be used to give a name to the communication channel
+to be used by the client user.
+
+
 Example:
 --------
 
@@ -81,6 +96,7 @@ mailbox: mailbox@4a0f4000 {
         reg = <0x4a0f4000 0x200>;
         interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
         ti,hwmods = "mailbox";
+        #mbox-cells = <1>;
         ti,mbox-num-users = <3>;
         ti,mbox-num-fifos = <8>;
         mbox_ipu: mbox_ipu {
@@ -93,12 +109,19 @@ mailbox: mailbox@4a0f4000 {
         };
 };
 
+dsp {
+        ...
+        mboxes = <&mailbox &mbox_dsp>;
+        ...
+};
+
 /* AM33xx */
 mailbox: mailbox@480C8000 {
         compatible = "ti,omap4-mailbox";
         reg = <0x480C8000 0x200>;
         interrupts = <77>;
         ti,hwmods = "mailbox";
+        #mbox-cells = <1>;
         ti,mbox-num-users = <4>;
         ti,mbox-num-fifos = <8>;
         mbox_wkupm3: wkup_m3 {
diff --git a/Documentation/devicetree/bindings/media/meson-ir.txt b/Documentation/devicetree/bindings/media/meson-ir.txt
new file mode 100644
index 000000000000..407848e85f31
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/meson-ir.txt
@@ -0,0 +1,14 @@
+* Amlogic Meson IR remote control receiver
+
+Required properties:
+ - compatible   : should be "amlogic,meson6-ir"
+ - reg          : physical base address and length of the device registers
+ - interrupts   : a single specifier for the interrupt from the device
+
+Example:
+
+        ir-receiver@c8100480 {
+                compatible= "amlogic,meson6-ir";
+                reg = <0xc8100480 0x20>;
+                interrupts = <0 15 1>;
+        };
diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt
index ba61782c2af9..9dafe6b06cd2 100644
--- a/Documentation/devicetree/bindings/media/rcar_vin.txt
+++ b/Documentation/devicetree/bindings/media/rcar_vin.txt
@@ -6,6 +6,8 @@ family of devices. The current blocks are always slaves and suppot one input
 channel which can be either RGB, YUYV or BT656.
 
  - compatible: Must be one of the following
+   - "renesas,vin-r8a7794" for the R8A7794 device
+   - "renesas,vin-r8a7793" for the R8A7793 device
    - "renesas,vin-r8a7791" for the R8A7791 device
    - "renesas,vin-r8a7790" for the R8A7790 device
    - "renesas,vin-r8a7779" for the R8A7779 device
diff --git a/Documentation/devicetree/bindings/media/si4713.txt b/Documentation/devicetree/bindings/media/si4713.txt
new file mode 100644
index 000000000000..5ee5552d3465
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/si4713.txt
@@ -0,0 +1,30 @@
+* Silicon Labs FM Radio transmitter
+
+The Silicon Labs Si4713 is an FM radio transmitter with receive power scan
+supporting 76-108 MHz. It includes an RDS encoder and has both, a stereo-analog
+and a digital interface, which supports I2S, left-justified and a custom
+DSP-mode format. It is programmable through an I2C interface.
+
+Required Properties:
+- compatible: Should contain "silabs,si4713"
+- reg: the I2C address of the device
+
+Optional Properties:
+- interrupts-extended: Interrupt specifier for the chips interrupt
+- reset-gpios: GPIO specifier for the chips reset line
+- vdd-supply: phandle for Vdd regulator
+- vio-supply: phandle for Vio regulator
+
+Example:
+
+&i2c2 {
+        fmtx: si4713@63 {
+                compatible = "silabs,si4713";
+                reg = <0x63>;
+
+                interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */
+                reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */
+                vio-supply = <&vio>;
+                vdd-supply = <&vaux1>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/memory-controllers/mvebu-sdram-controller.txt b/Documentation/devicetree/bindings/memory-controllers/mvebu-sdram-controller.txt
new file mode 100644
index 000000000000..89657d1d4cd4
--- /dev/null
+++ b/Documentation/devicetree/bindings/memory-controllers/mvebu-sdram-controller.txt
@@ -0,0 +1,21 @@
+Device Tree bindings for MVEBU SDRAM controllers
+
+The Marvell EBU SoCs all have a SDRAM controller. The SDRAM controller
+differs from one SoC variant to another, but they also share a number
+of commonalities.
+
+For now, this Device Tree binding documentation only documents the
+Armada XP SDRAM controller.
+
+Required properties:
+
+ - compatible: for Armada XP, "marvell,armada-xp-sdram-controller"
+ - reg: a resource specifier for the register space, which should
+   include all SDRAM controller registers as per the datasheet.
+
+Example:
+
+sdramc@1400 {
+        compatible = "marvell,armada-xp-sdram-controller";
+        reg = <0x1400 0x500>;
+};
diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra-mc.txt b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra-mc.txt
new file mode 100644
index 000000000000..f3db93c85eea
--- /dev/null
+++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra-mc.txt
@@ -0,0 +1,36 @@
+NVIDIA Tegra Memory Controller device tree bindings
+===================================================
+
+Required properties:
+- compatible: Should be "nvidia,tegra<chip>-mc"
+- reg: Physical base address and length of the controller's registers.
+- clocks: Must contain an entry for each entry in clock-names.
+  See ../clocks/clock-bindings.txt for details.
+- clock-names: Must include the following entries:
+  - mc: the module's clock input
+- interrupts: The interrupt outputs from the controller.
+- #iommu-cells: Should be 1. The single cell of the IOMMU specifier defines
+  the SWGROUP of the master.
+
+This device implements an IOMMU that complies with the generic IOMMU binding.
+See ../iommu/iommu.txt for details.
+
+Example:
+--------
+
+        mc: memory-controller@0,70019000 {
+                compatible = "nvidia,tegra124-mc";
+                reg = <0x0 0x70019000 0x0 0x1000>;
+                clocks = <&tegra_car TEGRA124_CLK_MC>;
+                clock-names = "mc";
+
+                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
+
+                #iommu-cells = <1>;
+        };
+
+        sdhci@0,700b0000 {
+                compatible = "nvidia,tegra124-sdhci";
+                ...
+                iommus = <&mc TEGRA_SWGROUP_SDMMC1A>;
+        };
diff --git a/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt b/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
new file mode 100644
index 000000000000..f64de95a8e8b
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
@@ -0,0 +1,51 @@
+Device-Tree bindings for Atmel's HLCDC (High LCD Controller) MFD driver
+
+Required properties:
+ - compatible: value should be one of the following:
+   "atmel,sama5d3-hlcdc"
+ - reg: base address and size of the HLCDC device registers.
+ - clock-names: the name of the 3 clocks requested by the HLCDC device.
+   Should contain "periph_clk", "sys_clk" and "slow_clk".
+ - clocks: should contain the 3 clocks requested by the HLCDC device.
+ - interrupts: should contain the description of the HLCDC interrupt line
+
+The HLCDC IP exposes two subdevices:
+ - a PWM chip: see ../pwm/atmel-hlcdc-pwm.txt
+ - a Display Controller: see ../drm/atmel-hlcdc-dc.txt
+
+Example:
+
+        hlcdc: hlcdc@f0030000 {
+                compatible = "atmel,sama5d3-hlcdc";
+                reg = <0xf0030000 0x2000>;
+                clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
+                clock-names = "periph_clk","sys_clk", "slow_clk";
+                interrupts = <36 IRQ_TYPE_LEVEL_HIGH 0>;
+                status = "disabled";
+
+                hlcdc-display-controller {
+                        compatible = "atmel,hlcdc-display-controller";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <0>;
+
+                                hlcdc_panel_output: endpoint@0 {
+                                        reg = <0>;
+                                        remote-endpoint = <&panel_input>;
+                                };
+                        };
+                };
+
+                hlcdc_pwm: hlcdc-pwm {
+                        compatible = "atmel,hlcdc-pwm";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_lcd_pwm>;
+                        #pwm-cells = <3>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/mfd/max77686.txt b/Documentation/devicetree/bindings/mfd/max77686.txt
index 678f3cf0b8f0..75fdfaf41831 100644
--- a/Documentation/devicetree/bindings/mfd/max77686.txt
+++ b/Documentation/devicetree/bindings/mfd/max77686.txt
@@ -34,6 +34,12 @@ to get matched with their hardware counterparts as follow:
         -BUCKn  :       for BUCKs, where n can lie in range 1 to 9.
                         example: BUCK1, BUCK5, BUCK9.
 
+  Regulators which can be turned off during system suspend:
+        -LDOn   :       2, 6-8, 10-12, 14-16,
+        -BUCKn  :       1-4.
+  Use standard regulator bindings for it ('regulator-off-in-suspend').
+
+
 Example:
 
         max77686@09 {
diff --git a/Documentation/devicetree/bindings/mfd/max77693.txt b/Documentation/devicetree/bindings/mfd/max77693.txt
index 11921cc417bf..01e9f30fe678 100644
--- a/Documentation/devicetree/bindings/mfd/max77693.txt
+++ b/Documentation/devicetree/bindings/mfd/max77693.txt
@@ -27,6 +27,20 @@ Optional properties:
 
         [*] refer Documentation/devicetree/bindings/regulator/regulator.txt
 
+- haptic : The MAX77693 haptic device utilises a PWM controlled motor to provide
+  users with tactile feedback. PWM period and duty-cycle are varied in
+  order to provide the approprite level of feedback.
+
+ Required properties:
+        - compatible : Must be "maxim,max77693-hpatic"
+        - haptic-supply : power supply for the haptic motor
+        [*] refer Documentation/devicetree/bindings/regulator/regulator.txt
+        - pwms : phandle to the physical PWM(Pulse Width Modulation) device.
+         PWM properties should be named "pwms". And number of cell is different
+         for each pwm device.
+         To get more informations, please refer to documentaion.
+        [*] refer Documentation/devicetree/bindings/pwm/pwm.txt
+
 Example:
         max77693@66 {
                 compatible = "maxim,max77693";
@@ -52,4 +66,11 @@ Example:
                                         regulator-boot-on;
                         };
                 };
+
+                haptic {
+                        compatible = "maxim,max77693-haptic";
+                        haptic-supply = <&haptic_supply>;
+                        pwms = <&pwm 0 40000 0>;
+                        pwm-names = "haptic";
+                };
         };
diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
index 0e4026a6cbbf..57a045016fca 100644
--- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
+++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
@@ -1,5 +1,5 @@
 
-* Samsung S2MPS11, S2MPS14 and S2MPU02 Voltage and Current Regulator
+* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator
 
 The Samsung S2MPS11 is a multi-function device which includes voltage and
 current regulators, RTC, charger controller and other sub-blocks. It is
@@ -7,8 +7,8 @@ interfaced to the host controller using an I2C interface. Each sub-block is
 addressed by the host system using different I2C slave addresses.
 
 Required properties:
-- compatible: Should be "samsung,s2mps11-pmic" or "samsung,s2mps14-pmic"
-              or "samsung,s2mpu02-pmic".
+- compatible: Should be "samsung,s2mps11-pmic" or "samsung,s2mps13-pmic"
+              or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
 - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.
 
 Optional properties:
@@ -17,8 +17,8 @@ Optional properties:
 - interrupts: Interrupt specifiers for interrupt sources.
 
 Optional nodes:
-- clocks: s2mps11 and s5m8767 provide three(AP/CP/BT) buffered 32.768 KHz
-  outputs, so to register these as clocks with common clock framework
+- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
+  KHz outputs, so to register these as clocks with common clock framework
   instantiate a sub-node named "clocks". It uses the common clock binding
   documented in :
   [Documentation/devicetree/bindings/clock/clock-bindings.txt]
@@ -30,12 +30,12 @@ Optional nodes:
     the clock which they consume.
     Clock               ID           Devices
     ----------------------------------------------------------
-    32KhzAP             0            S2MPS11, S2MPS14, S5M8767
-    32KhzCP             1            S2MPS11, S5M8767
-    32KhzBT             2            S2MPS11, S2MPS14, S5M8767
+    32KhzAP             0            S2MPS11, S2MPS13, S2MPS14, S5M8767
+    32KhzCP             1            S2MPS11, S2MPS13, S5M8767
+    32KhzBT             2            S2MPS11, S2MPS13, S2MPS14, S5M8767
 
-  - compatible: Should be one of: "samsung,s2mps11-clk", "samsung,s2mps14-clk",
-                "samsung,s5m8767-clk"
+  - compatible: Should be one of: "samsung,s2mps11-clk", "samsung,s2mps13-clk",
+                "samsung,s2mps14-clk", "samsung,s5m8767-clk"
 
 - regulators: The regulators of s2mps11 that have to be instantiated should be
 included in a sub-node named 'regulators'. Regulator nodes included in this
@@ -81,12 +81,14 @@ as per the datasheet of s2mps11.
         - LDOn
                   - valid values for n are:
                         - S2MPS11: 1 to 38
+                        - S2MPS13: 1 to 40
                         - S2MPS14: 1 to 25
                         - S2MPU02: 1 to 28
                   - Example: LDO1, LDO2, LDO28
         - BUCKn
                   - valid values for n are:
                         - S2MPS11: 1 to 10
+                        - S2MPS13: 1 to 10
                         - S2MPS14: 1 to 5
                         - S2MPU02: 1 to 7
                   - Example: BUCK1, BUCK2, BUCK9
diff --git a/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt b/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt
new file mode 100644
index 000000000000..d4e0141d3620
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt
@@ -0,0 +1,37 @@
+* Interrupt Controller
+
+Properties:
+- compatible: "brcm,bcm3384-intc"
+
+  Compatibility with BCM3384 and possibly other BCM33xx/BCM63xx SoCs.
+
+- reg: Address/length pairs for each mask/status register set.  Length must
+  be 8.  If multiple register sets are specified, the first set will
+  handle IRQ offsets 0..31, the second set 32..63, and so on.
+
+- interrupt-controller: This is an interrupt controller.
+
+- #interrupt-cells: Must be <1>.  Just a simple IRQ offset; no level/edge
+  or polarity configuration is possible with this controller.
+
+- interrupt-parent: This controller is cascaded from a MIPS CPU HW IRQ, or
+  from another INTC.
+
+- interrupts: The IRQ on the parent controller.
+
+Example:
+        periph_intc: periph_intc@14e00038 {
+                compatible = "brcm,bcm3384-intc";
+
+                /*
+                 * IRQs 0..31:  mask reg 0x14e00038, status reg 0x14e0003c
+                 * IRQs 32..63: mask reg 0x14e00340, status reg 0x14e00344
+                 */
+                reg = <0x14e00038 0x8 0x14e00340 0x8>;
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+
+                interrupt-parent = <&cpu_intc>;
+                interrupts = <4>;
+        };
diff --git a/Documentation/devicetree/bindings/mips/brcm/bmips.txt b/Documentation/devicetree/bindings/mips/brcm/bmips.txt
new file mode 100644
index 000000000000..8ef71b4085ca
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/brcm/bmips.txt
@@ -0,0 +1,8 @@
+* Broadcom MIPS (BMIPS) CPUs
+
+Required properties:
+- compatible: "brcm,bmips3300", "brcm,bmips4350", "brcm,bmips4380",
+  "brcm,bmips5000"
+
+- mips-hpt-frequency: This is common to all CPUs in the system so it lives
+  under the "cpus" node.
diff --git a/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt b/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt
new file mode 100644
index 000000000000..8a139cb3c0b5
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt
@@ -0,0 +1,11 @@
+* Broadcom cable/DSL platforms
+
+SoCs:
+
+Required properties:
+- compatible: "brcm,bcm3384", "brcm,bcm33843"
+
+Boards:
+
+Required properties:
+- compatible: "brcm,bcm93384wvg"
diff --git a/Documentation/devicetree/bindings/mips/brcm/usb.txt b/Documentation/devicetree/bindings/mips/brcm/usb.txt
new file mode 100644
index 000000000000..452c45c7bf29
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/brcm/usb.txt
@@ -0,0 +1,11 @@
+* Broadcom USB controllers
+
+Required properties:
+- compatible: "brcm,bcm3384-ohci", "brcm,bcm3384-ehci"
+
+  These currently use the generic-ohci and generic-ehci drivers.  On some
+  systems, special handling may be needed in the following cases:
+
+  - Restoring state after systemwide power save modes
+  - Sharing PHYs with the USBD (UDC) hardware
+  - Figuring out which controllers are disabled on ASIC bondout variants
diff --git a/Documentation/devicetree/bindings/mips/cpu_irq.txt b/Documentation/devicetree/bindings/mips/cpu_irq.txt
index 13aa4b62c62a..fc149f326dae 100644
--- a/Documentation/devicetree/bindings/mips/cpu_irq.txt
+++ b/Documentation/devicetree/bindings/mips/cpu_irq.txt
@@ -1,6 +1,6 @@
 MIPS CPU interrupt controller
 
-On MIPS the mips_cpu_intc_init() helper can be used to initialize the 8 CPU
+On MIPS the mips_cpu_irq_of_init() helper can be used to initialize the 8 CPU
 IRQs from a devicetree file and create a irq_domain for IRQ controller.
 
 With the irq_domain in place we can describe how the 8 IRQs are wired to the
@@ -36,7 +36,7 @@ Example devicetree:
 
 Example platform irq.c:
 static struct of_device_id __initdata of_irq_ids[] = {
-        { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init },
+        { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },
         { .compatible = "ralink,rt2880-intc", .data = intc_of_init },
         {},
 };
diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
index 6cd3525d0e09..ee4fc0576c7d 100644
--- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
@@ -18,6 +18,10 @@ Required Properties:
           specific extensions.
         - "samsung,exynos5420-dw-mshc": for controllers with Samsung Exynos5420
           specific extensions.
+        - "samsung,exynos7-dw-mshc": for controllers with Samsung Exynos7
+          specific extensions.
+        - "samsung,exynos7-dw-mshc-smu": for controllers with Samsung Exynos7
+          specific extensions having an SMU.
 
 * samsung,dw-mshc-ciu-div: Specifies the divider value for the card interface
   unit (ciu) clock. This property is applicable only for Exynos5 SoC's and
diff --git a/Documentation/devicetree/bindings/mmc/img-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/img-dw-mshc.txt
new file mode 100644
index 000000000000..85de99fcaa2f
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/img-dw-mshc.txt
@@ -0,0 +1,29 @@
+* Imagination specific extensions to the Synopsys Designware Mobile Storage
+  Host Controller
+
+The Synopsys designware mobile storage host controller is used to interface
+a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
+differences between the core Synopsys dw mshc controller properties described
+by synopsys-dw-mshc.txt and the properties used by the Imagination specific
+extensions to the Synopsys Designware Mobile Storage Host Controller.
+
+Required Properties:
+
+* compatible: should be
+        - "img,pistachio-dw-mshc": for Pistachio SoCs
+
+Example:
+
+        mmc@18142000 {
+                compatible = "img,pistachio-dw-mshc";
+                reg = <0x18142000 0x400>;
+                interrupts = <GIC_SHARED 39 IRQ_TYPE_LEVEL_HIGH>;
+
+                clocks = <&system_clk>, <&sdhost_clk>;
+                clock-names = "biu", "ciu";
+
+                fifo-depth = <0x20>;
+                bus-width = <4>;
+                num-slots = <1>;
+                disable-wp;
+        };
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
index 86223c3eda90..4dd6deb90719 100644
--- a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
+++ b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
@@ -12,6 +12,10 @@ Required properties:
   * for "marvell,armada-380-sdhci", two register areas. The first one
     for the SDHCI registers themselves, and the second one for the
     AXI/Mbus bridge registers of the SDHCI unit.
+- clocks: Array of clocks required for SDHCI; requires at least one for
+    I/O clock.
+- clock-names: Array of names corresponding to clocks property; shall be
+    "io" for I/O clock and "core" for optional core clock.
 
 Optional properties:
 - mrvl,clk-delay-cycles: Specify a number of cycles to delay for tuning.
@@ -23,6 +27,8 @@ sdhci@d4280800 {
         reg = <0xd4280800 0x800>;
         bus-width = <8>;
         interrupts = <27>;
+        clocks = <&chip CLKID_SDIO1XIN>, <&chip CLKID_SDIO1>;
+        clock-names = "io", "core";
         non-removable;
         mrvl,clk-delay-cycles = <31>;
 };
@@ -32,5 +38,6 @@ sdhci@d8000 {
         reg = <0xd8000 0x1000>, <0xdc000 0x100>;
         interrupts = <0 25 0x4>;
         clocks = <&gateclk 17>;
+        clock-names = "io";
         mrvl,clk-delay-cycles = <0x1F>;
 };
diff --git a/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/Documentation/devicetree/bindings/mtd/atmel-nand.txt
index 6edc3b616e98..1fe6dde98499 100644
--- a/Documentation/devicetree/bindings/mtd/atmel-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/atmel-nand.txt
@@ -5,7 +5,9 @@ Required properties:
 - reg : should specify localbus address and size used for the chip,
         and hardware ECC controller if available.
         If the hardware ECC is PMECC, it should contain address and size for
-        PMECC, PMECC Error Location controller and ROM which has lookup tables.
+        PMECC and PMECC Error Location controller.
+        The PMECC lookup table address and size in ROM is optional. If not
+        specified, driver will build it in runtime.
 - atmel,nand-addr-offset : offset for the address latch.
 - atmel,nand-cmd-offset : offset for the command latch.
 - #address-cells, #size-cells : Must be present if the device has sub-nodes
@@ -27,7 +29,7 @@ Optional properties:
   are: 512, 1024.
 - atmel,pmecc-lookup-table-offset : includes two offsets of lookup table in ROM
   for different sector size. First one is for sector size 512, the next is for
-  sector size 1024.
+  sector size 1024. If not specified, driver will build the table in runtime.
 - nand-bus-width : 8 or 16 bus width if not present 8
 - nand-on-flash-bbt: boolean to enable on flash bbt option if not present false
 - Nand Flash Controller(NFC) is a slave driver under Atmel nand flash
diff --git a/Documentation/devicetree/bindings/mtd/diskonchip.txt b/Documentation/devicetree/bindings/mtd/diskonchip.txt
new file mode 100644
index 000000000000..3e13bfdbea5b
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/diskonchip.txt
@@ -0,0 +1,15 @@
+M-Systems and Sandisk DiskOnChip devices
+
+M-System DiskOnChip G3
+======================
+The Sandisk (formerly M-Systems) docg3 is a nand device of 64M to 256MB.
+
+Required properties:
+ - compatible: should be "m-systems,diskonchip-g3"
+ - reg: register base and size
+
+Example:
+        docg3: flash@0 {
+                compatible = "m-systems,diskonchip-g3";
+                reg = <0x0 0x2000>;
+        };
diff --git a/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt b/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt
index 36ef07d3c90f..af8915b41ccf 100644
--- a/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt
@@ -11,8 +11,8 @@ Required properties:
   are made in native endianness.
 - #address-cells, #size-cells : Must be present if the device has sub-nodes
   representing partitions.
-- gpios : specifies the gpio pins to control the NAND device.  nwp is an
-  optional gpio and may be set to 0 if not present.
+- gpios : Specifies the GPIO pins to control the NAND device.  The order of
+  GPIO references is:  RDY, nCE, ALE, CLE, and an optional nWP.
 
 Optional properties:
 - bank-width : Width (in bytes) of the device.  If not present, the width
@@ -35,11 +35,11 @@ gpio-nand@1,0 {
         reg = <1 0x0000 0x2>;
         #address-cells = <1>;
         #size-cells = <1>;
-        gpios = <&banka 1 0     /* rdy */
-                 &banka 2 0     /* nce */
-                 &banka 3 0     /* ale */
-                 &banka 4 0     /* cle */
-                 0              /* nwp */>;
+        gpios = <&banka 1 0>,   /* RDY */
+                <&banka 2 0>,   /* nCE */
+                <&banka 3 0>,   /* ALE */
+                <&banka 4 0>,   /* CLE */
+                <0>;            /* nWP */
 
         partition@0 {
         ...
diff --git a/Documentation/devicetree/bindings/mtd/sunxi-nand.txt b/Documentation/devicetree/bindings/mtd/sunxi-nand.txt
new file mode 100644
index 000000000000..0273adb8638c
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/sunxi-nand.txt
@@ -0,0 +1,45 @@
+Allwinner NAND Flash Controller (NFC)
+
+Required properties:
+- compatible : "allwinner,sun4i-a10-nand".
+- reg : shall contain registers location and length for data and reg.
+- interrupts : shall define the nand controller interrupt.
+- #address-cells: shall be set to 1. Encode the nand CS.
+- #size-cells : shall be set to 0.
+- clocks : shall reference nand controller clocks.
+- clock-names : nand controller internal clock names. Shall contain :
+    * "ahb" : AHB gating clock
+    * "mod" : nand controller clock
+
+Optional children nodes:
+Children nodes represent the available nand chips.
+
+Optional properties:
+- allwinner,rb : shall contain the native Ready/Busy ids.
+ or
+- rb-gpios : shall contain the gpios used as R/B pins.
+- nand-ecc-mode : one of the supported ECC modes ("hw", "hw_syndrome", "soft",
+  "soft_bch" or "none")
+
+see Documentation/devicetree/mtd/nand.txt for generic bindings.
+
+
+Examples:
+nfc: nand@01c03000 {
+        compatible = "allwinner,sun4i-a10-nand";
+        reg = <0x01c03000 0x1000>;
+        interrupts = <0 37 1>;
+        clocks = <&ahb_gates 13>, <&nand_clk>;
+        clock-names = "ahb", "mod";
+        #address-cells = <1>;
+        #size-cells = <0>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
+        status = "okay";
+
+        nand@0 {
+                reg = <0>;
+                allwinner,rb = <0>;
+                nand-ecc-mode = "soft_bch";
+        };
+};
diff --git a/Documentation/devicetree/bindings/net/amd-xgbe.txt b/Documentation/devicetree/bindings/net/amd-xgbe.txt
index 41354f730beb..26efd526d16c 100644
--- a/Documentation/devicetree/bindings/net/amd-xgbe.txt
+++ b/Documentation/devicetree/bindings/net/amd-xgbe.txt
@@ -7,7 +7,10 @@ Required properties:
    - PCS registers
 - interrupt-parent: Should be the phandle for the interrupt controller
   that services interrupts for this device
-- interrupts: Should contain the amd-xgbe interrupt
+- interrupts: Should contain the amd-xgbe interrupt(s). The first interrupt
+  listed is required and is the general device interrupt. If the optional
+  amd,per-channel-interrupt property is specified, then one additional
+  interrupt for each DMA channel supported by the device should be specified
 - clocks:
    - DMA clock for the amd-xgbe device (used for calculating the
      correct Rx interrupt watchdog timer value on a DMA channel
@@ -23,6 +26,9 @@ Optional properties:
 - mac-address: mac address to be assigned to the device. Can be overridden
   by UEFI.
 - dma-coherent: Present if dma operations are coherent
+- amd,per-channel-interrupt: Indicates that Rx and Tx complete will generate
+  a unique interrupt for each DMA channel - this requires an additional
+  interrupt be configured for each DMA channel
 
 Example:
         xgbe@e0700000 {
@@ -30,7 +36,9 @@ Example:
                 reg = <0 0xe0700000 0 0x80000>,
                       <0 0xe0780000 0 0x80000>;
                 interrupt-parent = <&gic>;
-                interrupts = <0 325 4>;
+                interrupts = <0 325 4>,
+                             <0 326 1>, <0 327 1>, <0 328 1>, <0 329 1>;
+                amd,per-channel-interrupt;
                 clocks = <&xgbe_dma_clk>, <&xgbe_ptp_clk>;
                 clock-names = "dma_clk", "ptp_clk";
                 phy-handle = <&phy>;
diff --git a/Documentation/devicetree/bindings/net/can/c_can.txt b/Documentation/devicetree/bindings/net/can/c_can.txt
index 8f1ae81228e3..5a1d8b0c39e9 100644
--- a/Documentation/devicetree/bindings/net/can/c_can.txt
+++ b/Documentation/devicetree/bindings/net/can/c_can.txt
@@ -4,6 +4,8 @@ Bosch C_CAN/D_CAN controller Device Tree Bindings
 Required properties:
 - compatible            : Should be "bosch,c_can" for C_CAN controllers and
                           "bosch,d_can" for D_CAN controllers.
+                          Can be "ti,dra7-d_can", "ti,am3352-d_can" or
+                          "ti,am4372-d_can".
 - reg                   : physical base address and size of the C_CAN/D_CAN
                           registers map
 - interrupts            : property with a value describing the interrupt
@@ -12,6 +14,9 @@ Required properties:
 Optional properties:
 - ti,hwmods             : Must be "d_can<n>" or "c_can<n>", n being the
                           instance number
+- syscon-raminit        : Handle to system control region that contains the
+                          RAMINIT register, register offset to the RAMINIT
+                          register and the CAN instance number (0 offset).
 
 Note: "ti,hwmods" field is used to fetch the base address and irq
 resources from TI, omap hwmod data base during device registration.
diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.txt b/Documentation/devicetree/bindings/net/dsa/dsa.txt
index a62c889aafca..e124847443f8 100644
--- a/Documentation/devicetree/bindings/net/dsa/dsa.txt
+++ b/Documentation/devicetree/bindings/net/dsa/dsa.txt
@@ -10,7 +10,7 @@ Required properties:
 - dsa,ethernet          : Should be a phandle to a valid Ethernet device node
 - dsa,mii-bus           : Should be a phandle to a valid MDIO bus device node
 
-Optionnal properties:
+Optional properties:
 - interrupts            : property with a value describing the switch
                           interrupt number (not supported by the driver)
 
@@ -23,6 +23,13 @@ Each of these switch child nodes should have the following required properties:
 - #address-cells        : Must be 1
 - #size-cells           : Must be 0
 
+A switch child node has the following optional property:
+
+- eeprom-length         : Set to the length of an EEPROM connected to the
+                          switch. Must be set if the switch can not detect
+                          the presence and/or size of a connected EEPROM,
+                          otherwise optional.
+
 A switch may have multiple "port" children nodes
 
 Each port children node must have the following mandatory properties:
diff --git a/Documentation/devicetree/bindings/net/micrel.txt b/Documentation/devicetree/bindings/net/micrel.txt
index e1d99b95c4ec..87496a8c64ab 100644
--- a/Documentation/devicetree/bindings/net/micrel.txt
+++ b/Documentation/devicetree/bindings/net/micrel.txt
@@ -6,19 +6,32 @@ Optional properties:
 
  - micrel,led-mode : LED mode value to set for PHYs with configurable LEDs.
 
-              Configure the LED mode with single value. The list of PHYs and
-              the bits that are currently supported:
+        Configure the LED mode with single value. The list of PHYs and the
+        bits that are currently supported:
 
-              KSZ8001: register 0x1e, bits 15..14
-              KSZ8041: register 0x1e, bits 15..14
-              KSZ8021: register 0x1f, bits 5..4
-              KSZ8031: register 0x1f, bits 5..4
-              KSZ8051: register 0x1f, bits 5..4
+        KSZ8001: register 0x1e, bits 15..14
+        KSZ8041: register 0x1e, bits 15..14
+        KSZ8021: register 0x1f, bits 5..4
+        KSZ8031: register 0x1f, bits 5..4
+        KSZ8051: register 0x1f, bits 5..4
+        KSZ8081: register 0x1f, bits 5..4
+        KSZ8091: register 0x1f, bits 5..4
 
-              See the respective PHY datasheet for the mode values.
+        See the respective PHY datasheet for the mode values.
+
+ - micrel,rmii-reference-clock-select-25-mhz: RMII Reference Clock Select
+                                                bit selects 25 MHz mode
+
+        Setting the RMII Reference Clock Select bit enables 25 MHz rather
+        than 50 MHz clock mode.
+
+        Note that this option in only needed for certain PHY revisions with a
+        non-standard, inverted function of this configuration bit.
+        Specifically, a clock reference ("rmii-ref" below) is always needed to
+        actually select a mode.
 
  - clocks, clock-names: contains clocks according to the common clock bindings.
 
-              supported clocks:
-              - KSZ8021, KSZ8031: "rmii-ref": The RMII refence input clock. Used
-                to determine the XI input clock.
+        supported clocks:
+        - KSZ8021, KSZ8031, KSZ8081, KSZ8091: "rmii-ref": The RMII reference
+          input clock. Used to determine the XI input clock.
diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt
index 5b8c58903077..40831fbaff72 100644
--- a/Documentation/devicetree/bindings/net/phy.txt
+++ b/Documentation/devicetree/bindings/net/phy.txt
@@ -19,7 +19,6 @@ Optional Properties:
   specifications. If neither of these are specified, the default is to
   assume clause 22. The compatible list may also contain other
   elements.
-- max-speed: Maximum PHY supported speed (10, 100, 1000...)
 
   If the phy's identifier is known then the list may contain an entry
   of the form: "ethernet-phy-idAAAA.BBBB" where
@@ -29,6 +28,8 @@ Optional Properties:
             4 hex digits. This is the chip vendor OUI bits 19:24,
             followed by 10 bits of a vendor specific ID.
 
+- max-speed: Maximum PHY supported speed (10, 100, 1000...)
+
 Example:
 
 ethernet-phy@0 {
diff --git a/Documentation/devicetree/bindings/net/sh_eth.txt b/Documentation/devicetree/bindings/net/sh_eth.txt
index 34d4db1a4e25..2f6ec85fda8e 100644
--- a/Documentation/devicetree/bindings/net/sh_eth.txt
+++ b/Documentation/devicetree/bindings/net/sh_eth.txt
@@ -9,6 +9,7 @@ Required properties:
               "renesas,ether-r8a7779"  if the device is a part of R8A7779 SoC.
               "renesas,ether-r8a7790"  if the device is a part of R8A7790 SoC.
               "renesas,ether-r8a7791"  if the device is a part of R8A7791 SoC.
+              "renesas,ether-r8a7793"  if the device is a part of R8A7793 SoC.
               "renesas,ether-r8a7794"  if the device is a part of R8A7794 SoC.
               "renesas,ether-r7s72100" if the device is a part of R7S72100 SoC.
 - reg: offset and length of (1) the E-DMAC/feLic register block (required),
diff --git a/Documentation/devicetree/bindings/nios2/nios2.txt b/Documentation/devicetree/bindings/nios2/nios2.txt
new file mode 100644
index 000000000000..d6d0a94cb3bb
--- /dev/null
+++ b/Documentation/devicetree/bindings/nios2/nios2.txt
@@ -0,0 +1,62 @@
+* Nios II Processor Binding
+
+This binding specifies what properties available in the device tree
+representation of a Nios II Processor Core.
+
+Users can use sopc2dts tool for generating device tree sources (dts) from a
+Qsys system. See more detail in: http://www.alterawiki.com/wiki/Sopc2dts
+
+Required properties:
+
+- compatible: Compatible property value should be "altr,nios2-1.0".
+- reg: Contains CPU index.
+- interrupt-controller: Specifies that the node is an interrupt controller
+- #interrupt-cells: Specifies the number of cells needed to encode an
+                interrupt source, should be 1.
+- clock-frequency: Contains the clock frequency for CPU, in Hz.
+- dcache-line-size: Contains data cache line size.
+- icache-line-size: Contains instruction line size.
+- dcache-size: Contains data cache size.
+- icache-size: Contains instruction cache size.
+- altr,pid-num-bits: Specifies the number of bits to use to represent the process
+                identifier (PID).
+- altr,tlb-num-ways: Specifies the number of set-associativity ways in the TLB.
+- altr,tlb-num-entries: Specifies the number of entries in the TLB.
+- altr,tlb-ptr-sz: Specifies size of TLB pointer.
+- altr,has-mul: Specifies CPU hardware multipy support, should be 1.
+- altr,has-mmu: Specifies CPU support MMU support, should be 1.
+- altr,has-initda: Specifies CPU support initda instruction, should be 1.
+- altr,reset-addr: Specifies CPU reset address
+- altr,fast-tlb-miss-addr: Specifies CPU fast TLB miss exception address
+- altr,exception-addr: Specifies CPU exception address
+
+Optional properties:
+- altr,has-div: Specifies CPU hardware divide support
+- altr,implementation: Nios II core implementation, this should be "fast";
+
+Example:
+
+cpu@0x0 {
+        device_type = "cpu";
+        compatible = "altr,nios2-1.0";
+        reg = <0>;
+        interrupt-controller;
+        #interrupt-cells = <1>;
+        clock-frequency = <125000000>;
+        dcache-line-size = <32>;
+        icache-line-size = <32>;
+        dcache-size = <32768>;
+        icache-size = <32768>;
+        altr,implementation = "fast";
+        altr,pid-num-bits = <8>;
+        altr,tlb-num-ways = <16>;
+        altr,tlb-num-entries = <128>;
+        altr,tlb-ptr-sz = <7>;
+        altr,has-div = <1>;
+        altr,has-mul = <1>;
+        altr,reset-addr = <0xc2800000>;
+        altr,fast-tlb-miss-addr = <0xc7fff400>;
+        altr,exception-addr = <0xd0000020>;
+        altr,has-initda = <1>;
+        altr,has-mmu = <1>;
+};
diff --git a/Documentation/devicetree/bindings/nios2/timer.txt b/Documentation/devicetree/bindings/nios2/timer.txt
new file mode 100644
index 000000000000..904a5846d7ac
--- /dev/null
+++ b/Documentation/devicetree/bindings/nios2/timer.txt
@@ -0,0 +1,19 @@
+Altera Timer
+
+Required properties:
+
+- compatible : should be "altr,timer-1.0"
+- reg : Specifies base physical address and size of the registers.
+- interrupt-parent: phandle of the interrupt controller
+- interrupts : Should contain the timer interrupt number
+- clock-frequency : The frequency of the clock that drives the counter, in Hz.
+
+Example:
+
+timer {
+        compatible = "altr,timer-1.0";
+        reg = <0x00400000 0x00000020>;
+        interrupt-parent = <&cpu>;
+        interrupts = <11>;
+        clock-frequency = <125000000>;
+};
diff --git a/Documentation/devicetree/bindings/panel/auo,b116xw03.txt b/Documentation/devicetree/bindings/panel/auo,b116xw03.txt
new file mode 100644
index 000000000000..690d0a568ef3
--- /dev/null
+++ b/Documentation/devicetree/bindings/panel/auo,b116xw03.txt
@@ -0,0 +1,7 @@
+AU Optronics Corporation 11.6" HD (1366x768) color TFT-LCD panel
+
+Required properties:
+- compatible: should be "auo,b116xw03"
+
+This binding is compatible with the simple-panel binding, which is specified
+in simple-panel.txt in this directory.
diff --git a/Documentation/devicetree/bindings/panel/hannstar,hsd070pww1.txt b/Documentation/devicetree/bindings/panel/hannstar,hsd070pww1.txt
new file mode 100644
index 000000000000..7da1d5c038ff
--- /dev/null
+++ b/Documentation/devicetree/bindings/panel/hannstar,hsd070pww1.txt
@@ -0,0 +1,7 @@
+HannStar Display Corp. HSD070PWW1 7.0" WXGA TFT LCD panel
+
+Required properties:
+- compatible: should be "hannstar,hsd070pww1"
+
+This binding is compatible with the simple-panel binding, which is specified
+in simple-panel.txt in this directory.
diff --git a/Documentation/devicetree/bindings/panel/hit,tx23d38vm0caa.txt b/Documentation/devicetree/bindings/panel/hit,tx23d38vm0caa.txt
new file mode 100644
index 000000000000..04caaae19af6
--- /dev/null
+++ b/Documentation/devicetree/bindings/panel/hit,tx23d38vm0caa.txt
@@ -0,0 +1,7 @@
+Hitachi Ltd. Corporation 9" WVGA (800x480) TFT LCD panel
+
+Required properties:
+- compatible: should be "hit,tx23d38vm0caa"
+
+This binding is compatible with the simple-panel binding, which is specified
+in simple-panel.txt in this directory.
diff --git a/Documentation/devicetree/bindings/panel/innolux,g121i1-l01.txt b/Documentation/devicetree/bindings/panel/innolux,g121i1-l01.txt
new file mode 100644
index 000000000000..2743b07cd2f2
--- /dev/null
+++ b/Documentation/devicetree/bindings/panel/innolux,g121i1-l01.txt
@@ -0,0 +1,7 @@
+Innolux Corporation 12.1" WXGA (1280x800) TFT LCD panel
+
+Required properties:
+- compatible: should be "innolux,g121i1-l01"
+
+This binding is compatible with the simple-panel binding, which is specified
+in simple-panel.txt in this directory.
diff --git a/Documentation/devicetree/bindings/panel/sharp,lq101r1sx01.txt b/Documentation/devicetree/bindings/panel/sharp,lq101r1sx01.txt
new file mode 100644
index 000000000000..f522bb8e47e1
--- /dev/null
+++ b/Documentation/devicetree/bindings/panel/sharp,lq101r1sx01.txt
@@ -0,0 +1,49 @@
+Sharp Microelectronics 10.1" WQXGA TFT LCD panel
+
+This panel requires a dual-channel DSI host to operate. It supports two modes:
+- left-right: each channel drives the left or right half of the screen
+- even-odd: each channel drives the even or odd lines of the screen
+
+Each of the DSI channels controls a separate DSI peripheral. The peripheral
+driven by the first link (DSI-LINK1), left or even, is considered the primary
+peripheral and controls the device. The 'link2' property contains a phandle
+to the peripheral driven by the second link (DSI-LINK2, right or odd).
+
+Note that in video mode the DSI-LINK1 interface always provides the left/even
+pixels and DSI-LINK2 always provides the right/odd pixels. In command mode it
+is possible to program either link to drive the left/even or right/odd pixels
+but for the sake of consistency this binding assumes that the same assignment
+is chosen as for video mode.
+
+Required properties:
+- compatible: should be "sharp,lq101r1sx01"
+- reg: DSI virtual channel of the peripheral
+
+Required properties (for DSI-LINK1 only):
+- link2: phandle to the DSI peripheral on the secondary link. Note that the
+  presence of this property marks the containing node as DSI-LINK1.
+- power-supply: phandle of the regulator that provides the supply voltage
+
+Optional properties (for DSI-LINK1 only):
+- backlight: phandle of the backlight device attached to the panel
+
+Example:
+
+        dsi@54300000 {
+                panel: panel@0 {
+                        compatible = "sharp,lq101r1sx01";
+                        reg = <0>;
+
+                        link2 = <&secondary>;
+
+                        power-supply = <...>;
+                        backlight = <...>;
+                };
+        };
+
+        dsi@54400000 {
+                secondary: panel@0 {
+                        compatible = "sharp,lq101r1sx01";
+                        reg = <0>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
new file mode 100644
index 000000000000..6286f049bf18
--- /dev/null
+++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
@@ -0,0 +1,42 @@
+Freescale Layerscape PCIe controller
+
+This PCIe host controller is based on the Synopsis Designware PCIe IP
+and thus inherits all the common properties defined in designware-pcie.txt.
+
+Required properties:
+- compatible: should contain the platform identifier such as "fsl,ls1021a-pcie"
+- reg: base addresses and lengths of the PCIe controller
+- interrupts: A list of interrupt outputs of the controller. Must contain an
+  entry for each entry in the interrupt-names property.
+- interrupt-names: Must include the following entries:
+  "intr": The interrupt that is asserted for controller interrupts
+- fsl,pcie-scfg: Must include two entries.
+  The first entry must be a link to the SCFG device node
+  The second entry must be '0' or '1' based on physical PCIe controller index.
+  This is used to get SCFG PEXN registers
+
+Example:
+
+        pcie@3400000 {
+                compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";
+                reg = <0x00 0x03400000 0x0 0x00010000   /* controller registers */
+                       0x40 0x00000000 0x0 0x00002000>; /* configuration space */
+                reg-names = "regs", "config";
+                interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
+                interrupt-names = "intr";
+                fsl,pcie-scfg = <&scfg 0>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                device_type = "pci";
+                num-lanes = <4>;
+                bus-range = <0x0 0xff>;
+                ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
+                          0xc2000000 0x0 0x20000000 0x40 0x20000000 0x0 0x20000000   /* prefetchable memory */
+                          0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
+                #interrupt-cells = <1>;
+                interrupt-map-mask = <0 0 0 7>;
+                interrupt-map = <0000 0 0 1 &gic GIC_SPI 91  IRQ_TYPE_LEVEL_HIGH>,
+                                <0000 0 0 2 &gic GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>,
+                                <0000 0 0 3 &gic GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>,
+                                <0000 0 0 4 &gic GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;
+        };
diff --git a/Documentation/devicetree/bindings/pci/pci.txt b/Documentation/devicetree/bindings/pci/pci.txt
index 41aeed38926d..f8fbe9af7b2f 100644
--- a/Documentation/devicetree/bindings/pci/pci.txt
+++ b/Documentation/devicetree/bindings/pci/pci.txt
@@ -7,3 +7,14 @@ And for the interrupt mapping part:
 
 Open Firmware Recommended Practice: Interrupt Mapping
 http://www.openfirmware.org/1275/practice/imap/imap0_9d.pdf
+
+Additionally to the properties specified in the above standards a host bridge
+driver implementation may support the following properties:
+
+- linux,pci-domain:
+   If present this property assigns a fixed PCI domain number to a host bridge,
+   otherwise an unstable (across boots) unique number will be assigned.
+   It is required to either not set this property at all or set it for all
+   host bridges in the system, otherwise potentially conflicting domain numbers
+   may be assigned to root buses behind different host bridges.  The domain
+   number for each host bridge in the system must be unique.
diff --git a/Documentation/devicetree/bindings/phy/berlin-sata-phy.txt b/Documentation/devicetree/bindings/phy/berlin-sata-phy.txt
index 88f8c23384c0..c0155f842f62 100644
--- a/Documentation/devicetree/bindings/phy/berlin-sata-phy.txt
+++ b/Documentation/devicetree/bindings/phy/berlin-sata-phy.txt
@@ -2,7 +2,9 @@ Berlin SATA PHY
 ---------------
 
 Required properties:
-- compatible: should be "marvell,berlin2q-sata-phy"
+- compatible: should be one of
+    "marvell,berlin2-sata-phy"
+    "marvell,berlin2q-sata-phy"
 - address-cells: should be 1
 - size-cells: should be 0
 - phy-cells: from the generic PHY bindings, must be 1
diff --git a/Documentation/devicetree/bindings/phy/berlin-usb-phy.txt b/Documentation/devicetree/bindings/phy/berlin-usb-phy.txt
new file mode 100644
index 000000000000..be33780f668e
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/berlin-usb-phy.txt
@@ -0,0 +1,16 @@
+* Marvell Berlin USB PHY
+
+Required properties:
+- compatible: "marvell,berlin2-usb-phy" or "marvell,berlin2cd-usb-phy"
+- reg: base address and length of the registers
+- #phys-cells: should be 0
+- resets: reference to the reset controller
+
+Example:
+
+        usb-phy@f774000 {
+                compatible = "marvell,berlin2-usb-phy";
+                reg = <0xf774000 0x128>;
+                #phy-cells = <0>;
+                resets = <&chip 0x104 14>;
+        };
diff --git a/Documentation/devicetree/bindings/phy/phy-miphy28lp.txt b/Documentation/devicetree/bindings/phy/phy-miphy28lp.txt
new file mode 100644
index 000000000000..46a135dae6b3
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/phy-miphy28lp.txt
@@ -0,0 +1,128 @@
+STMicroelectronics STi MIPHY28LP PHY binding
+============================================
+
+This binding describes a miphy device that is used to control PHY hardware
+for SATA, PCIe or USB3.
+
+Required properties (controller (parent) node):
+- compatible    : Should be "st,miphy28lp-phy".
+- st,syscfg     : Should be a phandle of the system configuration register group
+                  which contain the SATA, PCIe or USB3 mode setting bits.
+
+Required nodes  :  A sub-node is required for each channel the controller
+                   provides. Address range information including the usual
+                   'reg' and 'reg-names' properties are used inside these
+                   nodes to describe the controller's topology. These nodes
+                   are translated by the driver's .xlate() function.
+
+Required properties (port (child) node):
+- #phy-cells    : Should be 1 (See second example)
+                  Cell after port phandle is device type from:
+                        - PHY_TYPE_SATA
+                        - PHY_TYPE_PCI
+                        - PHY_TYPE_USB3
+- reg           : Address and length of the register set for the device.
+- reg-names     : The names of the register addresses corresponding to the registers
+                  filled in "reg". It can also contain the offset of the system configuration
+                  registers used as glue-logic to setup the device for SATA/PCIe or USB3
+                  devices.
+- resets        : phandle to the parent reset controller.
+- reset-names   : Associated name must be "miphy-sw-rst".
+
+Optional properties (port (child) node):
+- st,osc-rdy            : to check the MIPHY0_OSC_RDY status in the glue-logic. This
+                          is not available in all the MiPHY. For example, for STiH407, only the
+                          MiPHY0 has this bit.
+- st,osc-force-ext      : to select the external oscillator. This can change from
+                          different MiPHY inside the same SoC.
+- st,sata_gen           : to select which SATA_SPDMODE has to be set in the SATA system config
+                          register.
+- st,px_rx_pol_inv      : to invert polarity of RXn/RXp (respectively negative line and positive
+                          line).
+- st,scc-on             : enable ssc to reduce effects of EMI (only for sata or PCIe).
+- st,tx-impedance-comp  : to compensate tx impedance avoiding out of range values.
+
+example:
+
+                miphy28lp_phy: miphy28lp@9b22000 {
+                        compatible = "st,miphy28lp-phy";
+                        st,syscfg = <&syscfg_core>;
+                        #address-cells  = <1>;
+                        #size-cells     = <1>;
+                        ranges;
+
+                        phy_port0: port@9b22000 {
+                                reg = <0x9b22000 0xff>,
+                                      <0x9b09000 0xff>,
+                                      <0x9b04000 0xff>,
+                                      <0x114 0x4>, /* sysctrl MiPHY cntrl */
+                                      <0x818 0x4>, /* sysctrl MiPHY status*/
+                                      <0xe0  0x4>, /* sysctrl PCIe */
+                                      <0xec  0x4>; /* sysctrl SATA */
+                                reg-names = "sata-up",
+                                            "pcie-up",
+                                            "pipew",
+                                            "miphy-ctrl-glue",
+                                            "miphy-status-glue",
+                                            "pcie-glue",
+                                            "sata-glue";
+                                #phy-cells = <1>;
+                                st,osc-rdy;
+                                reset-names = "miphy-sw-rst";
+                                resets = <&softreset STIH407_MIPHY0_SOFTRESET>;
+                        };
+
+                        phy_port1: port@9b2a000 {
+                                reg = <0x9b2a000 0xff>,
+                                      <0x9b19000 0xff>,
+                                      <0x9b14000 0xff>,
+                                      <0x118 0x4>,
+                                      <0x81c 0x4>,
+                                      <0xe4  0x4>,
+                                      <0xf0  0x4>;
+                                reg-names = "sata-up",
+                                            "pcie-up",
+                                            "pipew",
+                                            "miphy-ctrl-glue",
+                                            "miphy-status-glue",
+                                            "pcie-glue",
+                                            "sata-glue";
+                                #phy-cells = <1>;
+                                st,osc-force-ext;
+                                reset-names = "miphy-sw-rst";
+                                resets = <&softreset STIH407_MIPHY1_SOFTRESET>;
+                        };
+
+                        phy_port2: port@8f95000 {
+                                reg = <0x8f95000 0xff>,
+                                      <0x8f90000 0xff>,
+                                      <0x11c 0x4>,
+                                      <0x820 0x4>;
+                                reg-names = "pipew",
+                                    "usb3-up",
+                                    "miphy-ctrl-glue",
+                                    "miphy-status-glue";
+                                #phy-cells = <1>;
+                                reset-names = "miphy-sw-rst";
+                                resets = <&softreset STIH407_MIPHY2_SOFTRESET>;
+                        };
+                };
+
+
+Specifying phy control of devices
+=================================
+
+Device nodes should specify the configuration required in their "phys"
+property, containing a phandle to the miphy device node and an index
+specifying which configuration to use, as described in phy-bindings.txt.
+
+example:
+                sata0: sata@9b20000  {
+                        ...
+                        phys            = <&phy_port0 PHY_TYPE_SATA>;
+                        ...
+                };
+
+Macro definitions for the supported miphy configuration can be found in:
+
+include/dt-bindings/phy/phy-miphy28lp.h
diff --git a/Documentation/devicetree/bindings/phy/phy-mvebu.txt b/Documentation/devicetree/bindings/phy/phy-mvebu.txt
new file mode 100644
index 000000000000..f95b6260a3b3
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/phy-mvebu.txt
@@ -0,0 +1,43 @@
+* Marvell MVEBU SATA PHY
+
+Power control for the SATA phy found on Marvell MVEBU SoCs.
+
+This document extends the binding described in phy-bindings.txt
+
+Required properties :
+
+ - reg             : Offset and length of the register set for the SATA device
+ - compatible      : Should be "marvell,mvebu-sata-phy"
+ - clocks          : phandle of clock and specifier that supplies the device
+ - clock-names     : Should be "sata"
+
+Example:
+                sata-phy@84000 {
+                        compatible = "marvell,mvebu-sata-phy";
+                        reg = <0x84000 0x0334>;
+                        clocks = <&gate_clk 15>;
+                        clock-names = "sata";
+                        #phy-cells = <0>;
+                        status = "ok";
+                };
+
+Armada 375 USB cluster
+----------------------
+
+Armada 375 comes with an USB2 host and device controller and an USB3
+controller. The USB cluster control register allows to manage common
+features of both USB controllers.
+
+Required properties:
+
+- compatible: "marvell,armada-375-usb-cluster"
+- reg: Should contain usb cluster register location and length.
+- #phy-cells : from the generic phy bindings, must be 1. Possible
+values are 1 (USB2), 2 (USB3).
+
+Example:
+                usbcluster: usb-cluster@18400 {
+                        compatible = "marvell,armada-375-usb-cluster";
+                        reg = <0x18400 0x4>;
+                        #phy-cells = <1>
+                };
diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt
index 15e0f2c7130f..d5bad920827f 100644
--- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
+++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
@@ -128,6 +128,7 @@ Required properties:
 - compatible : Should be set to one of the following supported values:
         - "samsung,exynos5250-usbdrd-phy" - for exynos5250 SoC,
         - "samsung,exynos5420-usbdrd-phy" - for exynos5420 SoC.
+        - "samsung,exynos7-usbdrd-phy" - for exynos7 SoC.
 - reg : Register offset and length of USB DRD PHY register set;
 - clocks: Clock IDs array as required by the controller
 - clock-names: names of clocks correseponding to IDs in the clock property;
@@ -138,6 +139,11 @@ Required properties:
                PHY operations, associated by phy name. It is used to
                determine bit values for clock settings register.
                For Exynos5420 this is given as 'sclk_usbphy30' in CMU.
+        - optional clocks: Exynos7 SoC has now following additional
+                           gate clocks available:
+                           - phy_pipe: for PIPE3 phy
+                           - phy_utmi: for UTMI+ phy
+                           - itp: for ITP generation
 - samsung,pmu-syscon: phandle for PMU system controller interface, used to
                       control pmu registers for power isolation.
 - #phy-cells : from the generic PHY bindings, must be 1;
diff --git a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt
index a186181c402b..51b943cc9770 100644
--- a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-TZ1090-PDC's pin configuration nodes act as a container for an abitrary number
+TZ1090-PDC's pin configuration nodes act as a container for an arbitrary number
 of subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those pin(s)/group(s), and various pin configuration
diff --git a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
index 4b27c99f7f9d..509faa87ad0e 100644
--- a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-TZ1090's pin configuration nodes act as a container for an abitrary number of
+TZ1090's pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those pin(s)/group(s), and various pin configuration
@@ -67,7 +67,7 @@ Valid values for pin and group names are:
     They also all support the some form of muxing. Any pins which are contained
     in one of the mux groups (see below) can be muxed only to the functions
     supported by the mux group. All other pins can be muxed to the "perip"
-    function which which enables them with their intended peripheral.
+    function which enables them with their intended peripheral.
 
     Different pins in the same mux group cannot be muxed to different functions,
     however it is possible to mux only a subset of the pins in a mux group to a
diff --git a/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt b/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
index daa768956069..ac4da9fe07bd 100644
--- a/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
+++ b/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-Lantiq's pin configuration nodes act as a container for an abitrary number of
+Lantiq's pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those group(s), and two pin configuration parameters:
diff --git a/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt b/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
index b5469db1d7ad..e89b4677567d 100644
--- a/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
+++ b/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-Lantiq's pin configuration nodes act as a container for an abitrary number of
+Lantiq's pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those group(s), and two pin configuration parameters:
diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
new file mode 100644
index 000000000000..17e7240c6998
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
@@ -0,0 +1,96 @@
+== Amlogic Meson pinmux controller ==
+
+Required properties for the root node:
+ - compatible: "amlogic,meson8-pinctrl"
+ - reg: address and size of registers controlling irq functionality
+
+=== GPIO sub-nodes ===
+
+The 2 power domains of the controller (regular and always-on) are
+represented as sub-nodes and each of them acts as a GPIO controller.
+
+Required properties for sub-nodes are:
+ - reg: should contain address and size for mux, pull-enable, pull and
+   gpio register sets
+ - reg-names: an array of strings describing the "reg" entries. Must
+   contain "mux", "pull" and "gpio". "pull-enable" is optional and
+   when it is missing the "pull" registers are used instead
+ - gpio-controller: identifies the node as a gpio controller
+ - #gpio-cells: must be 2
+
+Valid sub-node names are:
+ - "banks" for the regular domain
+ - "ao-bank" for the always-on domain
+
+=== Other sub-nodes ===
+
+Child nodes without the "gpio-controller" represent some desired
+configuration for a pin or a group. Those nodes can be pinmux nodes or
+configuration nodes.
+
+Required properties for pinmux nodes are:
+ - groups: a list of pinmux groups. The list of all available groups
+   depends on the SoC and can be found in driver sources.
+ - function: the name of a function to activate for the specified set
+   of groups. The list of all available functions depends on the SoC
+   and can be found in driver sources.
+
+Required properties for configuration nodes:
+ - pins: a list of pin names
+
+Configuration nodes support the generic properties "bias-disable",
+"bias-pull-up" and "bias-pull-down", described in file
+pinctrl-bindings.txt
+
+=== Example ===
+
+        pinctrl: pinctrl@c1109880 {
+                compatible = "amlogic,meson8-pinctrl";
+                reg = <0xc1109880 0x10>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                gpio: banks@c11080b0 {
+                        reg = <0xc11080b0 0x28>,
+                              <0xc11080e8 0x18>,
+                              <0xc1108120 0x18>,
+                              <0xc1108030 0x30>;
+                        reg-names = "mux", "pull", "pull-enable", "gpio";
+                        gpio-controller;
+                        #gpio-cells = <2>;
+               };
+
+                gpio_ao: ao-bank@c1108030 {
+                        reg = <0xc8100014 0x4>,
+                              <0xc810002c 0x4>,
+                              <0xc8100024 0x8>;
+                        reg-names = "mux", "pull", "gpio";
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                };
+
+                nand {
+                        mux {
+                                groups = "nand_io", "nand_io_ce0", "nand_io_ce1",
+                                         "nand_io_rb0", "nand_ale", "nand_cle",
+                                         "nand_wen_clk", "nand_ren_clk", "nand_dqs",
+                                         "nand_ce2", "nand_ce3";
+                                function = "nand";
+                        };
+                };
+
+                uart_ao_a {
+                        mux {
+                                groups = "uart_tx_ao_a", "uart_rx_ao_a",
+                                         "uart_cts_ao_a", "uart_rts_ao_a";
+                                function = "uart_ao";
+                        };
+
+                        conf {
+                                pins = "GPIOAO_0", "GPIOAO_1",
+                                       "GPIOAO_2", "GPIOAO_3";
+                                bias-disable;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt
index 61e73cde9ae9..3c8ce28baad6 100644
--- a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt
+++ b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-Tegra's pin configuration nodes act as a container for an abitrary number of
+Tegra's pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those pin(s)/group(s), and various pin configuration
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
index 98eb94d91a1c..47d84b6ee91b 100644
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
@@ -216,4 +216,4 @@ arguments are described below.
   or 0 to disable debouncing
 
 More in-depth documentation on these parameters can be found in
-<include/linux/pinctrl/pinconfig-generic.h>
+<include/linux/pinctrl/pinconf-generic.h>
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt
index c596a6ad3285..5f55be59d914 100644
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt
@@ -13,7 +13,7 @@ Optional properties:
 Please refer to pinctrl-bindings.txt in this directory for details of the common
 pinctrl bindings used by client devices.
 
-SiRFprimaII's pinmux nodes act as a container for an abitrary number of subnodes.
+SiRFprimaII's pinmux nodes act as a container for an arbitrary number of subnodes.
 Each of these subnodes represents some desired configuration for a group of pins.
 
 Required subnode-properties:
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl_spear.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl_spear.txt
index b4480d5c3aca..458615596946 100644
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl_spear.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl_spear.txt
@@ -32,7 +32,7 @@ Required properties:
 Please refer to pinctrl-bindings.txt in this directory for details of the common
 pinctrl bindings used by client devices.
 
-SPEAr's pinmux nodes act as a container for an abitrary number of subnodes. Each
+SPEAr's pinmux nodes act as a container for an arbitrary number of subnodes. Each
 of these subnodes represents muxing for a pin, a group, or a list of pins or
 groups.
 
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt
index 2fb90b37aa09..a7bde64798c7 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt
@@ -18,7 +18,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-Qualcomm's pin configuration nodes act as a container for an abitrary number of
+Qualcomm's pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those pin(s)/group(s), and various pin configuration
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt
index ffafa1990a30..c4ea61ac56f2 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt
@@ -47,7 +47,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-The pin configuration nodes act as a container for an abitrary number of
+The pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those pin(s)/group(s), and various pin configuration
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt
index e33e4dcdce79..6e88e91feb11 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt
@@ -18,7 +18,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-Qualcomm's pin configuration nodes act as a container for an abitrary number of
+Qualcomm's pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those pin(s)/group(s), and various pin configuration
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
index 93b7de91b9f6..eb8d8aa41f20 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
@@ -47,7 +47,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-The pin configuration nodes act as a container for an abitrary number of
+The pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those pin(s)/group(s), and various pin configuration
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
index d2ea80dc43eb..e4d6a9d20f7d 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
@@ -18,7 +18,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-Qualcomm's pin configuration nodes act as a container for an abitrary number of
+Qualcomm's pin configuration nodes act as a container for an arbitrary number of
 subnodes. Each of these subnodes represents some desired configuration for a
 pin, a group, or a list of pins or groups. This configuration can include the
 mux function to select on those pin(s)/group(s), and various pin configuration
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
new file mode 100644
index 000000000000..7ed08048516a
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
@@ -0,0 +1,215 @@
+Qualcomm PMIC GPIO block
+
+This binding describes the GPIO block(s) found in the 8xxx series of
+PMIC's from Qualcomm.
+
+- compatible:
+        Usage: required
+        Value type: <string>
+        Definition: must be one of:
+                    "qcom,pm8018-gpio"
+                    "qcom,pm8038-gpio"
+                    "qcom,pm8058-gpio"
+                    "qcom,pm8917-gpio"
+                    "qcom,pm8921-gpio"
+                    "qcom,pm8941-gpio"
+                    "qcom,pma8084-gpio"
+
+- reg:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: Register base of the GPIO block and length.
+
+- interrupts:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: Must contain an array of encoded interrupt specifiers for
+                    each available GPIO
+
+- gpio-controller:
+        Usage: required
+        Value type: <none>
+        Definition: Mark the device node as a GPIO controller
+
+- #gpio-cells:
+        Usage: required
+        Value type: <u32>
+        Definition: Must be 2;
+                    the first cell will be used to define gpio number and the
+                    second denotes the flags for this gpio
+
+Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for
+a general description of GPIO and interrupt bindings.
+
+Please refer to pinctrl-bindings.txt in this directory for details of the
+common pinctrl bindings used by client devices, including the meaning of the
+phrase "pin configuration node".
+
+The pin configuration nodes act as a container for an arbitrary number of
+subnodes. Each of these subnodes represents some desired configuration for a
+pin or a list of pins. This configuration can include the
+mux function to select on those pin(s), and various pin configuration
+parameters, as listed below.
+
+
+SUBNODES:
+
+The name of each subnode is not important; all subnodes should be enumerated
+and processed purely based on their content.
+
+Each subnode only affects those parameters that are explicitly listed. In
+other words, a subnode that lists a mux function but no pin configuration
+parameters implies no information about any pin configuration parameters.
+Similarly, a pin subnode that describes a pullup parameter implies no
+information about e.g. the mux function.
+
+The following generic properties as defined in pinctrl-bindings.txt are valid
+to specify in a pin configuration subnode:
+
+- pins:
+        Usage: required
+        Value type: <string-array>
+        Definition: List of gpio pins affected by the properties specified in
+                    this subnode.  Valid pins are:
+                    gpio1-gpio6 for pm8018
+                    gpio1-gpio12 for pm8038
+                    gpio1-gpio40 for pm8058
+                    gpio1-gpio38 for pm8917
+                    gpio1-gpio44 for pm8921
+                    gpio1-gpio36 for pm8941
+                    gpio1-gpio22 for pma8084
+
+- function:
+        Usage: required
+        Value type: <string>
+        Definition: Specify the alternative function to be configured for the
+                    specified pins.  Valid values are:
+                    "normal",
+                    "paired",
+                    "func1",
+                    "func2",
+                    "dtest1",
+                    "dtest2",
+                    "dtest3",
+                    "dtest4"
+
+- bias-disable:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins should be configured as no pull.
+
+- bias-pull-down:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins should be configured as pull down.
+
+- bias-pull-up:
+        Usage: optional
+        Value type: <empty>
+        Definition: The specified pins should be configured as pull up.
+
+- qcom,pull-up-strength:
+        Usage: optional
+        Value type: <u32>
+        Definition: Specifies the strength to use for pull up, if selected.
+                    Valid values are; as defined in
+                    <dt-bindings/pinctrl/qcom,pmic-gpio.h>:
+                    1: 30uA                     (PMIC_GPIO_PULL_UP_30)
+                    2: 1.5uA                    (PMIC_GPIO_PULL_UP_1P5)
+                    3: 31.5uA                   (PMIC_GPIO_PULL_UP_31P5)
+                    4: 1.5uA + 30uA boost       (PMIC_GPIO_PULL_UP_1P5_30)
+                    If this property is ommited 30uA strength will be used if
+                    pull up is selected
+
+- bias-high-impedance:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins will put in high-Z mode and disabled.
+
+- input-enable:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are put in input mode.
+
+- output-high:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in output mode, driven
+                    high.
+
+- output-low:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in output mode, driven
+                    low.
+
+- power-source:
+        Usage: optional
+        Value type: <u32>
+        Definition: Selects the power source for the specified pins. Valid
+                    power sources are defined per chip in
+                    <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+
+- qcom,drive-strength:
+        Usage: optional
+        Value type: <u32>
+        Definition: Selects the drive strength for the specified pins. Value
+                    drive strengths are:
+                    0: no (PMIC_GPIO_STRENGTH_NO)
+                    1: high (PMIC_GPIO_STRENGTH_HIGH) 0.9mA @ 1.8V - 1.9mA @ 2.6V
+                    2: medium (PMIC_GPIO_STRENGTH_MED) 0.6mA @ 1.8V - 1.25mA @ 2.6V
+                    3: low (PMIC_GPIO_STRENGTH_LOW) 0.15mA @ 1.8V - 0.3mA @ 2.6V
+                    as defined in <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+
+- drive-push-pull:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in push-pull mode.
+
+- drive-open-drain:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in open-drain mode.
+
+- drive-open-source:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in open-source mode.
+
+Example:
+
+        pm8921_gpio: gpio@150 {
+                compatible = "qcom,pm8921-gpio";
+                reg = <0x150 0x160>;
+                interrupts = <192 1>, <193 1>, <194 1>,
+                             <195 1>, <196 1>, <197 1>,
+                             <198 1>, <199 1>, <200 1>,
+                             <201 1>, <202 1>, <203 1>,
+                             <204 1>, <205 1>, <206 1>,
+                             <207 1>, <208 1>, <209 1>,
+                             <210 1>, <211 1>, <212 1>,
+                             <213 1>, <214 1>, <215 1>,
+                             <216 1>, <217 1>, <218 1>,
+                             <219 1>, <220 1>, <221 1>,
+                             <222 1>, <223 1>, <224 1>,
+                             <225 1>, <226 1>, <227 1>,
+                             <228 1>, <229 1>, <230 1>,
+                             <231 1>, <232 1>, <233 1>,
+                             <234 1>, <235 1>;
+
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                pm8921_gpio_keys: gpio-keys {
+                        volume-keys {
+                                pins = "gpio20", "gpio21";
+                                function = "normal";
+
+                                input-enable;
+                                bias-pull-up;
+                                drive-push-pull;
+                                qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+                                power-source = <PM8921_GPIO_S4>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt
new file mode 100644
index 000000000000..854774b194ed
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt
@@ -0,0 +1,162 @@
+Qualcomm PMIC Multi-Purpose Pin (MPP) block
+
+This binding describes the MPP block(s) found in the 8xxx series
+of PMIC's from Qualcomm.
+
+- compatible:
+        Usage: required
+        Value type: <string>
+        Definition: Should contain one of:
+                    "qcom,pm8841-mpp",
+                    "qcom,pm8941-mpp",
+                    "qcom,pma8084-mpp",
+
+- reg:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: Register base of the MPP block and length.
+
+- interrupts:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: Must contain an array of encoded interrupt specifiers for
+                    each available MPP
+
+- gpio-controller:
+        Usage: required
+        Value type: <none>
+        Definition: Mark the device node as a GPIO controller
+
+- #gpio-cells:
+        Usage: required
+        Value type: <u32>
+        Definition: Must be 2;
+                    the first cell will be used to define MPP number and the
+                    second denotes the flags for this MPP
+
+Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for
+a general description of GPIO and interrupt bindings.
+
+Please refer to pinctrl-bindings.txt in this directory for details of the
+common pinctrl bindings used by client devices, including the meaning of the
+phrase "pin configuration node".
+
+The pin configuration nodes act as a container for an arbitrary number of
+subnodes. Each of these subnodes represents some desired configuration for a
+pin or a list of pins. This configuration can include the
+mux function to select on those pin(s), and various pin configuration
+parameters, as listed below.
+
+SUBNODES:
+
+The name of each subnode is not important; all subnodes should be enumerated
+and processed purely based on their content.
+
+Each subnode only affects those parameters that are explicitly listed. In
+other words, a subnode that lists a mux function but no pin configuration
+parameters implies no information about any pin configuration parameters.
+Similarly, a pin subnode that describes a pullup parameter implies no
+information about e.g. the mux function.
+
+The following generic properties as defined in pinctrl-bindings.txt are valid
+to specify in a pin configuration subnode:
+
+- pins:
+        Usage: required
+        Value type: <string-array>
+        Definition: List of MPP pins affected by the properties specified in
+                    this subnode.  Valid pins are:
+                    mpp1-mpp4 for pm8841
+                    mpp1-mpp8 for pm8941
+                    mpp1-mpp4 for pma8084
+
+- function:
+        Usage: required
+        Value type: <string>
+        Definition: Specify the alternative function to be configured for the
+                    specified pins.  Valid values are:
+                    "normal",
+                    "paired",
+                    "dtest1",
+                    "dtest2",
+                    "dtest3",
+                    "dtest4"
+
+- bias-disable:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins should be configured as no pull.
+
+- bias-pull-up:
+        Usage: optional
+        Value type: <u32>
+        Definition: The specified pins should be configured as pull up.
+                    Valid values are 600, 10000 and 30000 in bidirectional mode
+                    only, i.e. when operating in qcom,analog-mode and input and
+                    outputs are enabled. The hardware ignores the configuration
+                    when operating in other modes.
+
+- bias-high-impedance:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins will put in high-Z mode and disabled.
+
+- input-enable:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are put in input mode, i.e. their input
+                    buffer is enabled
+
+- output-high:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in output mode, driven
+                    high.
+
+- output-low:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in output mode, driven
+                    low.
+
+- power-source:
+        Usage: optional
+        Value type: <u32>
+        Definition: Selects the power source for the specified pins. Valid power
+                    sources are defined in <dt-bindings/pinctrl/qcom,pmic-mpp.h>
+
+- qcom,analog-mode:
+        Usage: optional
+        Value type: <none>
+        Definition: Selects Analog mode of operation: combined with input-enable
+                    and/or output-high, output-low MPP could operate as
+                    Bidirectional Logic, Analog Input, Analog Output.
+
+- qcom,amux-route:
+        Usage: optional
+        Value type: <u32>
+        Definition: Selects the source for analog input. Valid values are
+                    defined in <dt-bindings/pinctrl/qcom,pmic-mpp.h>
+                    PMIC_MPP_AMUX_ROUTE_CH5, PMIC_MPP_AMUX_ROUTE_CH6...
+
+Example:
+
+        mpps@a000 {
+                compatible = "qcom,pm8841-mpp";
+                reg = <0xa000>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                interrupts = <4 0xa0 0 0>, <4 0xa1 0 0>, <4 0xa2 0 0>, <4 0xa3 0 0>;
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&pm8841_default>;
+
+                pm8841_default: default {
+                        gpio {
+                                pins = "mpp1", "mpp2", "mpp3", "mpp4";
+                                function = "normal";
+                                input-enable;
+                                power-source = <PM8841_MPP_S3>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
index e82aaf492517..8425838a6dff 100644
--- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
@@ -18,6 +18,7 @@ Required Properties:
   - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.
   - "samsung,exynos5260-pinctrl": for Exynos5260 compatible pin-controller.
   - "samsung,exynos5420-pinctrl": for Exynos5420 compatible pin-controller.
+  - "samsung,exynos7-pinctrl": for Exynos7 compatible pin-controller.
 
 - reg: Base address of the pin controller hardware module and length of
   the address space it occupies.
@@ -136,6 +137,8 @@ B. External Wakeup Interrupts: For supporting external wakeup interrupts, a
        found on Samsung S3C64xx SoCs,
      - samsung,exynos4210-wakeup-eint: represents wakeup interrupt controller
        found on Samsung Exynos4210 and S5PC110/S5PV210 SoCs.
+     - samsung,exynos7-wakeup-eint: represents wakeup interrupt controller
+       found on Samsung Exynos7 SoC.
    - interrupt-parent: phandle of the interrupt parent to which the external
      wakeup interrupts are forwarded to.
    - interrupts: interrupt used by multiplexed wakeup interrupts.
diff --git a/Documentation/devicetree/bindings/pinctrl/ste,abx500.txt b/Documentation/devicetree/bindings/pinctrl/ste,abx500.txt
index e3865e136067..87697420439e 100644
--- a/Documentation/devicetree/bindings/pinctrl/ste,abx500.txt
+++ b/Documentation/devicetree/bindings/pinctrl/ste,abx500.txt
@@ -8,42 +8,8 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
 phrase "pin configuration node".
 
-ST Ericsson's pin configuration nodes act as a container for an arbitrary number of
-subnodes. Each of these subnodes represents some desired configuration for a
-pin, a group, or a list of pins or groups. This configuration can include the
-mux function to select on those pin(s)/group(s), and various pin configuration
-parameters, such as input, output, pull up, pull down...
-
-The name of each subnode is not important; all subnodes should be enumerated
-and processed purely based on their content.
-
-Required subnode-properties:
-- ste,pins : An array of strings. Each string contains the name of a pin or
-    group.
-
-Optional subnode-properties:
-- ste,function: A string containing the name of the function to mux to the
-  pin or group.
-
-- generic pin configuration option to use. Example :
-
-        default_cfg {
-                ste,pins = "GPIO1";
-                bias-disable;
-        };
-
-- ste,config: Handle of pin configuration node containing the generic
-  pinconfig options to use, as described in pinctrl-bindings.txt in
-  this directory. Example :
-
-        pcfg_bias_disable: pcfg_bias_disable {
-                bias-disable;
-        };
-
-        default_cfg {
-                ste,pins = "GPIO1";
-                ste.config = <&pcfg_bias_disable>;
-        };
+ST Ericsson's pin configuration nodes use the generic pin multiplexing
+and pin configuration bindings, see pinctrl-bindings.txt
 
 Example board file extract:
 
@@ -54,11 +20,11 @@ Example board file extract:
         sysclkreq2 {
                 sysclkreq2_default_mode: sysclkreq2_default {
                         default_mux {
-                                ste,function = "sysclkreq";
-                                ste,pins = "sysclkreq2_d_1";
+                                function = "sysclkreq";
+                                groups = "sysclkreq2_d_1";
                         };
                         default_cfg {
-                                ste,pins = "GPIO1";
+                                pins = "GPIO1";
                                 bias-disable;
                         };
                 };
@@ -66,11 +32,11 @@ Example board file extract:
         sysclkreq3 {
                 sysclkreq3_default_mode: sysclkreq3_default {
                         default_mux {
-                                ste,function = "sysclkreq";
-                                ste,pins = "sysclkreq3_d_1";
+                                function = "sysclkreq";
+                                groups = "sysclkreq3_d_1";
                         };
                         default_cfg {
-                                ste,pins = "GPIO2";
+                                pins = "GPIO2";
                                 output-low;
                         };
                 };
@@ -78,11 +44,11 @@ Example board file extract:
         gpio3 {
                 gpio3_default_mode: gpio3_default {
                         default_mux {
-                                ste,function = "gpio";
-                                ste,pins = "gpio3_a_1";
+                                function = "gpio";
+                                groups = "gpio3_a_1";
                         };
                         default_cfg {
-                                ste,pins = "GPIO3";
+                                pins = "GPIO3";
                                 output-low;
                         };
                 };
@@ -90,11 +56,11 @@ Example board file extract:
         sysclkreq6 {
                 sysclkreq6_default_mode: sysclkreq6_default {
                         default_mux {
-                                ste,function = "sysclkreq";
-                                ste,pins = "sysclkreq6_d_1";
+                                function = "sysclkreq";
+                                groups = "sysclkreq6_d_1";
                         };
                         default_cfg {
-                                ste,pins = "GPIO4";
+                                pins = "GPIO4";
                                 bias-disable;
                         };
                 };
@@ -102,11 +68,11 @@ Example board file extract:
         pwmout1 {
                 pwmout1_default_mode: pwmout1_default {
                         default_mux {
-                                ste,function = "pwmout";
-                                ste,pins = "pwmout1_d_1";
+                                function = "pwmout";
+                                groups = "pwmout1_d_1";
                         };
                         default_cfg {
-                                ste,pins = "GPIO14";
+                                pins = "GPIO14";
                                 output-low;
                         };
                 };
@@ -114,11 +80,11 @@ Example board file extract:
         pwmout2 {
                 pwmout2_default_mode: pwmout2_default {
                         pwmout2_default_mux {
-                                ste,function = "pwmout";
-                                ste,pins = "pwmout2_d_1";
+                                function = "pwmout";
+                                groups = "pwmout2_d_1";
                         };
                         pwmout2_default_cfg {
-                                ste,pins = "GPIO15";
+                                pins = "GPIO15";
                                 output-low;
                         };
                 };
@@ -126,11 +92,11 @@ Example board file extract:
         pwmout3 {
                 pwmout3_default_mode: pwmout3_default {
                         pwmout3_default_mux {
-                                ste,function = "pwmout";
-                                ste,pins = "pwmout3_d_1";
+                                function = "pwmout";
+                                groups = "pwmout3_d_1";
                         };
                         pwmout3_default_cfg {
-                                ste,pins = "GPIO16";
+                                pins = "GPIO16";
                                 output-low;
                         };
                 };
@@ -139,15 +105,15 @@ Example board file extract:
 
                 adi1_default_mode: adi1_default {
                         adi1_default_mux {
-                                ste,function = "adi1";
-                                ste,pins = "adi1_d_1";
+                                function = "adi1";
+                                groups = "adi1_d_1";
                         };
                         adi1_default_cfg1 {
-                                ste,pins = "GPIO17","GPIO19","GPIO20";
+                                pins = "GPIO17","GPIO19","GPIO20";
                                 bias-disable;
                         };
                         adi1_default_cfg2 {
-                                ste,pins = "GPIO18";
+                                pins = "GPIO18";
                                 output-low;
                         };
                 };
@@ -155,15 +121,15 @@ Example board file extract:
         dmic12 {
                 dmic12_default_mode: dmic12_default {
                         dmic12_default_mux {
-                                ste,function = "dmic";
-                                ste,pins = "dmic12_d_1";
+                                function = "dmic";
+                                groups = "dmic12_d_1";
                         };
                         dmic12_default_cfg1 {
-                                ste,pins = "GPIO27";
+                                pins = "GPIO27";
                                 output-low;
                         };
                         dmic12_default_cfg2 {
-                                ste,pins = "GPIO28";
+                                pins = "GPIO28";
                                 bias-disable;
                         };
                 };
@@ -171,15 +137,15 @@ Example board file extract:
         dmic34 {
                 dmic34_default_mode: dmic34_default {
                         dmic34_default_mux {
-                                ste,function = "dmic";
-                                ste,pins = "dmic34_d_1";
+                                function = "dmic";
+                                groups = "dmic34_d_1";
                         };
                         dmic34_default_cfg1 {
-                                ste,pins = "GPIO29";
+                                pins = "GPIO29";
                                 output-low;
                         };
                         dmic34_default_cfg2 {
-                                ste,pins = "GPIO30";
+                                pins = "GPIO30";
                                 bias-disable;{
 
                         };
@@ -188,15 +154,15 @@ Example board file extract:
         dmic56 {
                 dmic56_default_mode: dmic56_default {
                         dmic56_default_mux {
-                                ste,function = "dmic";
-                                ste,pins = "dmic56_d_1";
+                                function = "dmic";
+                                groups = "dmic56_d_1";
                         };
                         dmic56_default_cfg1 {
-                                ste,pins = "GPIO31";
+                                pins = "GPIO31";
                                 output-low;
                         };
                         dmic56_default_cfg2 {
-                                ste,pins = "GPIO32";
+                                pins = "GPIO32";
                                 bias-disable;
                         };
                 };
@@ -204,11 +170,11 @@ Example board file extract:
         sysclkreq5 {
                 sysclkreq5_default_mode: sysclkreq5_default {
                         sysclkreq5_default_mux {
-                                ste,function = "sysclkreq";
-                                ste,pins = "sysclkreq5_d_1";
+                                function = "sysclkreq";
+                                groups = "sysclkreq5_d_1";
                         };
                         sysclkreq5_default_cfg {
-                                ste,pins = "GPIO42";
+                                pins = "GPIO42";
                                 output-low;
                         };
                 };
@@ -216,11 +182,11 @@ Example board file extract:
         batremn {
                 batremn_default_mode: batremn_default {
                         batremn_default_mux {
-                                ste,function = "batremn";
-                                ste,pins = "batremn_d_1";
+                                function = "batremn";
+                                groups = "batremn_d_1";
                         };
                         batremn_default_cfg {
-                                ste,pins = "GPIO43";
+                                pins = "GPIO43";
                                 bias-disable;
                         };
                 };
@@ -228,11 +194,11 @@ Example board file extract:
         service {
                 service_default_mode: service_default {
                         service_default_mux {
-                                ste,function = "service";
-                                ste,pins = "service_d_1";
+                                function = "service";
+                                groups = "service_d_1";
                         };
                         service_default_cfg {
-                                ste,pins = "GPIO44";
+                                pins = "GPIO44";
                                 bias-disable;
                         };
                 };
@@ -240,13 +206,13 @@ Example board file extract:
         pwrctrl0 {
                 pwrctrl0_default_mux: pwrctrl0_mux {
                         pwrctrl0_default_mux {
-                                ste,function = "pwrctrl";
-                                ste,pins = "pwrctrl0_d_1";
+                                function = "pwrctrl";
+                                groups = "pwrctrl0_d_1";
                         };
                 };
                 pwrctrl0_default_mode: pwrctrl0_default {
                         pwrctrl0_default_cfg {
-                                ste,pins = "GPIO45";
+                                pins = "GPIO45";
                                 bias-disable;
                         };
                 };
@@ -254,13 +220,13 @@ Example board file extract:
         pwrctrl1 {
                 pwrctrl1_default_mux: pwrctrl1_mux {
                         pwrctrl1_default_mux {
-                                ste,function = "pwrctrl";
-                                ste,pins = "pwrctrl1_d_1";
+                                function = "pwrctrl";
+                                groups = "pwrctrl1_d_1";
                         };
                 };
                 pwrctrl1_default_mode: pwrctrl1_default {
                         pwrctrl1_default_cfg {
-                                ste,pins = "GPIO46";
+                                pins = "GPIO46";
                                 bias-disable;
                         };
                 };
@@ -268,11 +234,11 @@ Example board file extract:
         pwmextvibra1 {
                 pwmextvibra1_default_mode: pwmextvibra1_default {
                         pwmextvibra1_default_mux {
-                                ste,function = "pwmextvibra";
-                                ste,pins = "pwmextvibra1_d_1";
+                                function = "pwmextvibra";
+                                groups = "pwmextvibra1_d_1";
                         };
                         pwmextvibra1_default_cfg {
-                                ste,pins = "GPIO47";
+                                pins = "GPIO47";
                                 bias-disable;
                         };
                 };
@@ -280,11 +246,11 @@ Example board file extract:
         pwmextvibra2 {
                 pwmextvibra2_default_mode: pwmextvibra2_default {
                         pwmextvibra2_default_mux {
-                                ste,function = "pwmextvibra";
-                                ste,pins = "pwmextvibra2_d_1";
+                                function = "pwmextvibra";
+                                groups = "pwmextvibra2_d_1";
                         };
                         pwmextvibra1_default_cfg {
-                                ste,pins = "GPIO48";
+                                pins = "GPIO48";
                                 bias-disable;
                         };
                 };
@@ -292,11 +258,11 @@ Example board file extract:
         gpio51 {
                 gpio51_default_mode: gpio51_default {
                                 gpio51_default_mux {
-                                ste,function = "gpio";
-                                ste,pins = "gpio51_a_1";
+                                function = "gpio";
+                                groups = "gpio51_a_1";
                         };
                         gpio51_default_cfg {
-                                ste,pins = "GPIO51";
+                                pins = "GPIO51";
                                 output-low;
                         };
                 };
@@ -304,11 +270,11 @@ Example board file extract:
         gpio52 {
                 gpio52_default_mode: gpio52_default {
                         gpio52_default_mux {
-                                ste,function = "gpio";
-                                ste,pins = "gpio52_a_1";
+                                function = "gpio";
+                                groups = "gpio52_a_1";
                         };
                         gpio52_default_cfg {
-                                ste,pins = "GPIO52";
+                                pins = "GPIO52";
                                 bias-pull-down;
                         };
                 };
@@ -316,11 +282,11 @@ Example board file extract:
         gpio53 {
                 gpio53_default_mode: gpio53_default {
                         gpio53_default_mux {
-                                ste,function = "gpio";
-                                ste,pins = "gpio53_a_1";
+                                function = "gpio";
+                                groups = "gpio53_a_1";
                         };
                         gpio53_default_cfg {
-                                ste,pins = "GPIO53";
+                                pins = "GPIO53";
                                 bias-pull-down;
                         };
                 };
@@ -328,11 +294,11 @@ Example board file extract:
         gpio54 {
                 gpio54_default_mode: gpio54_default {
                         gpio54_default_mux {
-                                ste,function = "gpio";
-                                ste,pins = "gpio54_a_1";
+                                function = "gpio";
+                                groups = "gpio54_a_1";
                         };
                         gpio54_default_cfg {
-                                ste,pins = "GPIO54";
+                                pins = "GPIO54";
                                 output-low;
                         };
                 };
@@ -340,11 +306,11 @@ Example board file extract:
         pdmclkdat {
                 pdmclkdat_default_mode: pdmclkdat_default {
                         pdmclkdat_default_mux {
-                                ste,function = "pdm";
-                                ste,pins = "pdmclkdat_d_1";
+                                function = "pdm";
+                                groups = "pdmclkdat_d_1";
                         };
                         pdmclkdat_default_cfg {
-                                ste,pins = "GPIO55", "GPIO56";
+                                pins = "GPIO55", "GPIO56";
                                 bias-disable;
                         };
                 };
diff --git a/Documentation/devicetree/bindings/power/power-controller.txt b/Documentation/devicetree/bindings/power/power-controller.txt
new file mode 100644
index 000000000000..4f7a3bc9c407
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/power-controller.txt
@@ -0,0 +1,18 @@
+* Generic system power control capability
+
+Power-management integrated circuits or miscellaneous hardware components are
+sometimes able to control the system power. The device driver associated with these
+components might need to define this capability, which tells the kernel that
+it can be used to switch off the system. The corresponding device must have the
+standard property "system-power-controller" in its device node. This property
+marks the device as able to control the system power. In order to test if this
+property is found programmatically, use the helper function
+"of_device_is_system_power_controller" from of.h .
+
+Example:
+
+act8846: act8846@5 {
+         compatible = "active-semi,act8846";
+         status = "okay";
+         system-power-controller;
+}
diff --git a/Documentation/devicetree/bindings/power_supply/gpio-charger.txt b/Documentation/devicetree/bindings/power_supply/gpio-charger.txt
new file mode 100644
index 000000000000..adbb5dc5b6e9
--- /dev/null
+++ b/Documentation/devicetree/bindings/power_supply/gpio-charger.txt
@@ -0,0 +1,27 @@
+gpio-charger
+
+Required properties :
+ - compatible : "gpio-charger"
+ - gpios : GPIO indicating the charger presence.
+   See GPIO binding in bindings/gpio/gpio.txt .
+ - charger-type : power supply type, one of
+     unknown
+     battery
+     ups
+     mains
+     usb-sdp (USB standard downstream port)
+     usb-dcp (USB dedicated charging port)
+     usb-cdp (USB charging downstream port)
+     usb-aca (USB accessory charger adapter)
+
+Example:
+
+        usb_charger: charger {
+                compatible = "gpio-charger";
+                charger-type = "usb-sdp";
+                gpios = <&gpf0 2 0 0 0>;
+        }
+
+        battery {
+                power-supplies = <&usb_charger>;
+        };
diff --git a/Documentation/devicetree/bindings/power_supply/imx-snvs-poweroff.txt b/Documentation/devicetree/bindings/power_supply/imx-snvs-poweroff.txt
new file mode 100644
index 000000000000..dc7c9bad63ea
--- /dev/null
+++ b/Documentation/devicetree/bindings/power_supply/imx-snvs-poweroff.txt
@@ -0,0 +1,23 @@
+i.mx6 Poweroff Driver
+
+SNVS_LPCR in SNVS module can power off the whole system by pull
+PMIC_ON_REQ low if PMIC_ON_REQ is connected with external PMIC.
+If you don't want to use PMIC_ON_REQ as power on/off control,
+please set status='disabled' to disable this driver.
+
+Required Properties:
+-compatible: "fsl,sec-v4.0-poweroff"
+-reg: Specifies the physical address of the SNVS_LPCR register
+
+Example:
+        snvs@020cc000 {
+                compatible = "fsl,sec-v4.0-mon", "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0x020cc000 0x4000>;
+                .....
+                snvs_poweroff: snvs-poweroff@38 {
+                        compatible = "fsl,sec-v4.0-poweroff";
+                        reg = <0x38 0x4>;
+                };
+        }
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
new file mode 100644
index 000000000000..edeea160ca39
--- /dev/null
+++ b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
@@ -0,0 +1,534 @@
+=============================================================================
+Freescale Frame Manager Device Bindings
+
+CONTENTS
+  - FMan Node
+  - FMan Port Node
+  - FMan MURAM Node
+  - FMan dTSEC/XGEC/mEMAC Node
+  - FMan IEEE 1588 Node
+  - Example
+
+=============================================================================
+FMan Node
+
+DESCRIPTION
+
+Due to the fact that the FMan is an aggregation of sub-engines (ports, MACs,
+etc.) the FMan node will have child nodes for each of them.
+
+PROPERTIES
+
+- compatible
+                Usage: required
+                Value type: <stringlist>
+                Definition: Must include "fsl,fman"
+                FMan version can be determined via FM_IP_REV_1 register in the
+                FMan block. The offset is 0xc4 from the beginning of the
+                Frame Processing Manager memory map (0xc3000 from the
+                beginning of the FMan node).
+
+- cell-index
+                Usage: required
+                Value type: <u32>
+                Definition: Specifies the index of the FMan unit.
+
+                The cell-index value may be used by the SoC, to identify the
+                FMan unit in the SoC memory map. In the table bellow,
+                there's a description of the cell-index use in each SoC:
+
+                - P1023:
+                register[bit]                   FMan unit       cell-index
+                ============================================================
+                DEVDISR[1]                      1               0
+
+                - P2041, P3041, P4080 P5020, P5040:
+                register[bit]                   FMan unit       cell-index
+                ============================================================
+                DCFG_DEVDISR2[6]                1               0
+                DCFG_DEVDISR2[14]               2               1
+                        (Second FM available only in P4080 and P5040)
+
+                - B4860, T1040, T2080, T4240:
+                register[bit]                   FMan unit       cell-index
+                ============================================================
+                DCFG_CCSR_DEVDISR2[24]          1               0
+                DCFG_CCSR_DEVDISR2[25]          2               1
+                        (Second FM available only in T4240)
+
+                DEVDISR, DCFG_DEVDISR2 and DCFG_CCSR_DEVDISR2 are located in
+                the specific SoC "Device Configuration/Pin Control" Memory
+                Map.
+
+- reg
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: A standard property. Specifies the offset of the
+                following configuration registers:
+                - BMI configuration registers.
+                - QMI configuration registers.
+                - DMA configuration registers.
+                - FPM configuration registers.
+                - FMan controller configuration registers.
+
+- ranges
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: A standard property.
+
+- clocks
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: phandle for the fman input clock.
+
+- clock-names
+                usage: required
+                Value type: <stringlist>
+                Definition: "fmanclk" for the fman input clock.
+
+- interrupts
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: A pair of IRQs are specified in this property.
+                The first element is associated with the event interrupts and
+                the second element is associated with the error interrupts.
+
+- fsl,qman-channel-range
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: Specifies the range of the available dedicated
+                channels in the FMan. The first cell specifies the beginning
+                of the range and the second cell specifies the number of
+                channels.
+                Further information available at:
+                "Work Queue (WQ) Channel Assignments in the QMan" section
+                in DPAA Reference Manual.
+
+- fsl,qman
+- fsl,bman
+                Usage: required
+                Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt
+
+=============================================================================
+FMan MURAM Node
+
+DESCRIPTION
+
+FMan Internal memory - shared between all the FMan modules.
+It contains data structures that are common and written to or read by
+the modules.
+FMan internal memory is split into the following parts:
+        Packet buffering (Tx/Rx FIFOs)
+        Frames internal context
+
+PROPERTIES
+
+- compatible
+                Usage: required
+                Value type: <stringlist>
+                Definition: Must include "fsl,fman-muram"
+
+- ranges
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: A standard property.
+                Specifies the multi-user memory offset and the size within
+                the FMan.
+
+EXAMPLE
+
+muram@0 {
+        compatible = "fsl,fman-muram";
+        ranges = <0 0x000000 0x28000>;
+};
+
+=============================================================================
+FMan Port Node
+
+DESCRIPTION
+
+The Frame Manager (FMan) supports several types of hardware ports:
+        Ethernet receiver (RX)
+        Ethernet transmitter (TX)
+        Offline/Host command (O/H)
+
+PROPERTIES
+
+- compatible
+                Usage: required
+                Value type: <stringlist>
+                Definition: A standard property.
+                Must include one of the following:
+                        - "fsl,fman-v2-port-oh" for FManV2 OH ports
+                        - "fsl,fman-v2-port-rx" for FManV2 RX ports
+                        - "fsl,fman-v2-port-tx" for FManV2 TX ports
+                        - "fsl,fman-v3-port-oh" for FManV3 OH ports
+                        - "fsl,fman-v3-port-rx" for FManV3 RX ports
+                        - "fsl,fman-v3-port-tx" for FManV3 TX ports
+
+- cell-index
+                Usage: required
+                Value type: <u32>
+                Definition: Specifies the hardware port id.
+                Each hardware port on the FMan has its own hardware PortID.
+                Super set of all hardware Port IDs available at FMan Reference
+                Manual under "FMan Hardware Ports in Freescale Devices" table.
+
+                Each hardware port is assigned a 4KB, port-specific page in
+                the FMan hardware port memory region (which is part of the
+                FMan memory map). The first 4 KB in the FMan hardware ports
+                memory region is used for what are called common registers.
+                The subsequent 63 4KB pages are allocated to the hardware
+                ports.
+                The page of a specific port is determined by the cell-index.
+
+- reg
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: There is one reg region describing the port
+                configuration registers.
+
+EXAMPLE
+
+port@a8000 {
+        cell-index = <0x28>;
+        compatible = "fsl,fman-v2-port-tx";
+        reg = <0xa8000 0x1000>;
+};
+
+port@88000 {
+        cell-index = <0x8>;
+        compatible = "fsl,fman-v2-port-rx";
+        reg = <0x88000 0x1000>;
+};
+
+port@81000 {
+        cell-index = <0x1>;
+        compatible = "fsl,fman-v2-port-oh";
+        reg = <0x81000 0x1000>;
+};
+
+=============================================================================
+FMan dTSEC/XGEC/mEMAC Node
+
+DESCRIPTION
+
+mEMAC/dTSEC/XGEC are the Ethernet network interfaces
+
+PROPERTIES
+
+- compatible
+                Usage: required
+                Value type: <stringlist>
+                Definition: A standard property.
+                Must include one of the following:
+                - "fsl,fman-dtsec" for dTSEC MAC
+                - "fsl,fman-xgec" for XGEC MAC
+                - "fsl,fman-memac for mEMAC MAC
+
+- cell-index
+                Usage: required
+                Value type: <u32>
+                Definition: Specifies the MAC id.
+
+                The cell-index value may be used by the FMan or the SoC, to
+                identify the MAC unit in the FMan (or SoC) memory map.
+                In the tables bellow there's a description of the cell-index
+                use, there are two tables, one describes the use of cell-index
+                by the FMan, the second describes the use by the SoC:
+
+                1. FMan Registers
+
+                FManV2:
+                register[bit]           MAC             cell-index
+                ============================================================
+                FM_EPI[16]              XGEC            8
+                FM_EPI[16+n]            dTSECn          n-1
+                FM_NPI[11+n]            dTSECn          n-1
+                        n = 1,..,5
+
+                FManV3:
+                register[bit]           MAC             cell-index
+                ============================================================
+                FM_EPI[16+n]            mEMACn          n-1
+                FM_EPI[25]              mEMAC10         9
+
+                FM_NPI[11+n]            mEMACn          n-1
+                FM_NPI[10]              mEMAC10         9
+                FM_NPI[11]              mEMAC9          8
+                        n = 1,..8
+
+                FM_EPI and FM_NPI are located in the FMan memory map.
+
+                2. SoC registers:
+
+                - P2041, P3041, P4080 P5020, P5040:
+                register[bit]           FMan            MAC             cell
+                                        Unit                            index
+                ============================================================
+                DCFG_DEVDISR2[7]        1               XGEC            8
+                DCFG_DEVDISR2[7+n]      1               dTSECn          n-1
+                DCFG_DEVDISR2[15]       2               XGEC            8
+                DCFG_DEVDISR2[15+n]     2               dTSECn          n-1
+                        n = 1,..5
+
+                - T1040, T2080, T4240, B4860:
+                register[bit]                   FMan    MAC             cell
+                                                Unit                    index
+                ============================================================
+                DCFG_CCSR_DEVDISR2[n-1]         1       mEMACn          n-1
+                DCFG_CCSR_DEVDISR2[11+n]        2       mEMACn          n-1
+                        n = 1,..6,9,10
+
+                EVDISR, DCFG_DEVDISR2 and DCFG_CCSR_DEVDISR2 are located in
+                the specific SoC "Device Configuration/Pin Control" Memory
+                Map.
+
+- reg
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: A standard property.
+
+- fsl,fman-ports
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: An array of two phandles - the first references is
+                the FMan RX port and the second is the TX port used by this
+                MAC.
+
+- ptp-timer
+                Usage required
+                Value type: <phandle>
+                Definition: A phandle for 1EEE1588 timer.
+
+EXAMPLE
+
+fman1_tx28: port@a8000 {
+        cell-index = <0x28>;
+        compatible = "fsl,fman-v2-port-tx";
+        reg = <0xa8000 0x1000>;
+};
+
+fman1_rx8: port@88000 {
+        cell-index = <0x8>;
+        compatible = "fsl,fman-v2-port-rx";
+        reg = <0x88000 0x1000>;
+};
+
+ptp-timer: ptp_timer@fe000 {
+        compatible = "fsl,fman-ptp-timer";
+        reg = <0xfe000 0x1000>;
+};
+
+ethernet@e0000 {
+        compatible = "fsl,fman-dtsec";
+        cell-index = <0>;
+        reg = <0xe0000 0x1000>;
+        fsl,fman-ports = <&fman1_rx8 &fman1_tx28>;
+        ptp-timer = <&ptp-timer>;
+};
+
+============================================================================
+FMan IEEE 1588 Node
+
+DESCRIPTION
+
+The FMan interface to support IEEE 1588
+
+
+PROPERTIES
+
+- compatible
+                Usage: required
+                Value type: <stringlist>
+                Definition: A standard property.
+                Must include "fsl,fman-ptp-timer".
+
+- reg
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: A standard property.
+
+EXAMPLE
+
+ptp-timer@fe000 {
+        compatible = "fsl,fman-ptp-timer";
+        reg = <0xfe000 0x1000>;
+};
+
+=============================================================================
+Example
+
+fman@400000 {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        cell-index = <1>;
+        compatible = "fsl,fman"
+        ranges = <0 0x400000 0x100000>;
+        reg = <0x400000 0x100000>;
+        clocks = <&fman_clk>;
+        clock-names = "fmanclk";
+        interrupts = <
+                96 2 0 0
+                16 2 1 1>;
+        fsl,qman-channel-range = <0x40 0xc>;
+
+        muram@0 {
+                compatible = "fsl,fman-muram";
+                reg = <0x0 0x28000>;
+        };
+
+        port@81000 {
+                cell-index = <1>;
+                compatible = "fsl,fman-v2-port-oh";
+                reg = <0x81000 0x1000>;
+        };
+
+        port@82000 {
+                cell-index = <2>;
+                compatible = "fsl,fman-v2-port-oh";
+                reg = <0x82000 0x1000>;
+        };
+
+        port@83000 {
+                cell-index = <3>;
+                compatible = "fsl,fman-v2-port-oh";
+                reg = <0x83000 0x1000>;
+        };
+
+        port@84000 {
+                cell-index = <4>;
+                compatible = "fsl,fman-v2-port-oh";
+                reg = <0x84000 0x1000>;
+        };
+
+        port@85000 {
+                cell-index = <5>;
+                compatible = "fsl,fman-v2-port-oh";
+                reg = <0x85000 0x1000>;
+        };
+
+        port@86000 {
+                cell-index = <6>;
+                compatible = "fsl,fman-v2-port-oh";
+                reg = <0x86000 0x1000>;
+        };
+
+        fman1_rx_0x8: port@88000 {
+                cell-index = <0x8>;
+                compatible = "fsl,fman-v2-port-rx";
+                reg = <0x88000 0x1000>;
+        };
+
+        fman1_rx_0x9: port@89000 {
+                cell-index = <0x9>;
+                compatible = "fsl,fman-v2-port-rx";
+                reg = <0x89000 0x1000>;
+        };
+
+        fman1_rx_0xa: port@8a000 {
+                cell-index = <0xa>;
+                compatible = "fsl,fman-v2-port-rx";
+                reg = <0x8a000 0x1000>;
+        };
+
+        fman1_rx_0xb: port@8b000 {
+                cell-index = <0xb>;
+                compatible = "fsl,fman-v2-port-rx";
+                reg = <0x8b000 0x1000>;
+        };
+
+        fman1_rx_0xc: port@8c000 {
+                cell-index = <0xc>;
+                compatible = "fsl,fman-v2-port-rx";
+                reg = <0x8c000 0x1000>;
+        };
+
+        fman1_rx_0x10: port@90000 {
+                cell-index = <0x10>;
+                compatible = "fsl,fman-v2-port-rx";
+                reg = <0x90000 0x1000>;
+        };
+
+        fman1_tx_0x28: port@a8000 {
+                cell-index = <0x28>;
+                compatible = "fsl,fman-v2-port-tx";
+                reg = <0xa8000 0x1000>;
+        };
+
+        fman1_tx_0x29: port@a9000 {
+                cell-index = <0x29>;
+                compatible = "fsl,fman-v2-port-tx";
+                reg = <0xa9000 0x1000>;
+        };
+
+        fman1_tx_0x2a: port@aa000 {
+                cell-index = <0x2a>;
+                compatible = "fsl,fman-v2-port-tx";
+                reg = <0xaa000 0x1000>;
+        };
+
+        fman1_tx_0x2b: port@ab000 {
+                cell-index = <0x2b>;
+                compatible = "fsl,fman-v2-port-tx";
+                reg = <0xab000 0x1000>;
+        };
+
+        fman1_tx_0x2c: port@ac0000 {
+                cell-index = <0x2c>;
+                compatible = "fsl,fman-v2-port-tx";
+                reg = <0xac000 0x1000>;
+        };
+
+        fman1_tx_0x30: port@b0000 {
+                cell-index = <0x30>;
+                compatible = "fsl,fman-v2-port-tx";
+                reg = <0xb0000 0x1000>;
+        };
+
+        ethernet@e0000 {
+                compatible = "fsl,fman-dtsec";
+                cell-index = <0>;
+                reg = <0xe0000 0x1000>;
+                fsl,fman-ports = <&fman1_rx_0x8 &fman1_tx_0x28>;
+        };
+
+        ethernet@e2000 {
+                compatible = "fsl,fman-dtsec";
+                cell-index = <1>;
+                reg = <0xe2000 0x1000>;
+                fsl,fman-ports = <&fman1_rx_0x9 &fman1_tx_0x29>;
+        };
+
+        ethernet@e4000 {
+                compatible = "fsl,fman-dtsec";
+                cell-index = <2>;
+                reg = <0xe4000 0x1000>;
+                fsl,fman-ports = <&fman1_rx_0xa &fman1_tx_0x2a>;
+        };
+
+        ethernet@e6000 {
+                compatible = "fsl,fman-dtsec";
+                cell-index = <3>;
+                reg = <0xe6000 0x1000>;
+                fsl,fman-ports = <&fman1_rx_0xb &fman1_tx_0x2b>;
+        };
+
+        ethernet@e8000 {
+                compatible = "fsl,fman-dtsec";
+                cell-index = <4>;
+                reg = <0xf0000 0x1000>;
+                fsl,fman-ports = <&fman1_rx_0xc &fman1_tx_0x2c>;
+
+        ethernet@f0000 {
+                cell-index = <8>;
+                compatible = "fsl,fman-xgec";
+                reg = <0xf0000 0x1000>;
+                fsl,fman-ports = <&fman1_rx_0x10 &fman1_tx_0x30>;
+        };
+
+        ptp-timer@fe000 {
+                compatible = "fsl,fman-ptp-timer";
+                reg = <0xfe000 0x1000>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/pwm/atmel-hlcdc-pwm.txt b/Documentation/devicetree/bindings/pwm/atmel-hlcdc-pwm.txt
new file mode 100644
index 000000000000..cfda0d57d302
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/atmel-hlcdc-pwm.txt
@@ -0,0 +1,29 @@
+Device-Tree bindings for Atmel's HLCDC (High-end LCD Controller) PWM driver
+
+The Atmel HLCDC PWM is subdevice of the HLCDC MFD device.
+See ../mfd/atmel-hlcdc.txt for more details.
+
+Required properties:
+ - compatible: value should be one of the following:
+   "atmel,hlcdc-pwm"
+ - pinctr-names: the pin control state names. Should contain "default".
+ - pinctrl-0: should contain the pinctrl states described by pinctrl
+   default.
+ - #pwm-cells: should be set to 3. This PWM chip use the default 3 cells
+   bindings defined in pwm.txt in this directory.
+
+Example:
+
+        hlcdc: hlcdc@f0030000 {
+                compatible = "atmel,sama5d3-hlcdc";
+                reg = <0xf0030000 0x2000>;
+                clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
+                clock-names = "periph_clk","sys_clk", "slow_clk";
+
+                hlcdc_pwm: hlcdc-pwm {
+                        compatible = "atmel,hlcdc-pwm";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_lcd_pwm>;
+                        #pwm-cells = <3>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt b/Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt
new file mode 100644
index 000000000000..fb6fb31bc4c4
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt
@@ -0,0 +1,30 @@
+BCM2835 PWM controller (Raspberry Pi controller)
+
+Required properties:
+- compatible: should be "brcm,bcm2835-pwm"
+- reg: physical base address and length of the controller's registers
+- clock: This clock defines the base clock frequency of the PWM hardware
+  system, the period and the duty_cycle of the PWM signal is a multiple of
+  the base period.
+- #pwm-cells: Should be 2. See pwm.txt in this directory for a description of
+  the cells format.
+
+Examples:
+
+pwm@2020c000 {
+        compatible = "brcm,bcm2835-pwm";
+        reg = <0x2020c000 0x28>;
+        clocks = <&clk_pwm>;
+        #pwm-cells = <2>;
+};
+
+clocks {
+        ....
+                clk_pwm: pwm {
+                        compatible = "fixed-clock";
+                        reg = <3>;
+                        #clock-cells = <0>;
+                        clock-frequency = <9200000>;
+                };
+        ....
+};
diff --git a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
index 865614b34d6f..dad6358074ac 100644
--- a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
@@ -5,6 +5,10 @@ Required properties:
 - compatible: "active-semi,act8846" or "active-semi,act8865"
 - reg: I2C slave address
 
+Optional properties:
+- system-power-controller: Telling whether or not this pmic is controlling
+  the system power. See Documentation/devicetree/bindings/power/power-controller.txt .
+
 Any standard regulator properties can be used to configure the single regulator.
 
 The valid names for regulators are:
diff --git a/Documentation/devicetree/bindings/regulator/max77802.txt b/Documentation/devicetree/bindings/regulator/max77802.txt
index 5aeaffc0f1f0..79e5476444f7 100644
--- a/Documentation/devicetree/bindings/regulator/max77802.txt
+++ b/Documentation/devicetree/bindings/regulator/max77802.txt
@@ -25,6 +25,29 @@ with their hardware counterparts as follow. The valid names are:
                         example: LDO1, LDO2, LDO35.
         -BUCKn  :       for BUCKs, where n can lie in range 1 to 10.
                         example: BUCK1, BUCK5, BUCK10.
+
+The max77802 regulator supports two different operating modes: Normal and Low
+Power Mode. Some regulators support the modes to be changed at startup or by
+the consumers during normal operation while others only support to change the
+mode during system suspend. The standard regulator suspend states binding can
+be used to configure the regulator operating mode.
+
+The regulators that support the standard "regulator-initial-mode" property,
+changing their mode during normal operation are: LDOs 1, 3, 20 and 21.
+
+The possible values for "regulator-initial-mode" and "regulator-mode" are:
+        1: Normal regulator voltage output mode.
+        3: Low Power which reduces the quiescent current down to only 1uA
+
+The list of valid modes are defined in the dt-bindings/clock/maxim,max77802.h
+header and can be included by device tree source files.
+
+The standard "regulator-mode" property can only be used for regulators that
+support changing their mode to Low Power Mode during suspend. These regulators
+are: BUCKs 2-4 and LDOs 1-35. Also, it only takes effect if the regulator has
+been enabled for the given suspend state using "regulator-on-in-suspend" and
+has not been disabled for that state using "regulator-off-in-suspend".
+
 Example:
 
         max77802@09 {
@@ -36,11 +59,23 @@ Example:
                 #size-cells = <0>;
 
                 regulators {
+                        ldo1_reg: LDO1 {
+                                regulator-name = "vdd_1v0";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                                regulator-initial-mode = <MAX77802_OPMODE_LP>;
+                        };
+
                         ldo11_reg: LDO11 {
                                 regulator-name = "vdd_ldo11";
                                 regulator-min-microvolt = <1900000>;
                                 regulator-max-microvolt = <1900000>;
                                 regulator-always-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-mode = <MAX77802_OPMODE_LP>;
+                                };
                         };
 
                         buck1_reg: BUCK1 {
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index 86074334e342..abb26b58c83e 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -19,6 +19,24 @@ Optional properties:
   design requires. This property describes the total system ramp time
   required due to the combination of internal ramping of the regulator itself,
   and board design issues such as trace capacitance and load on the supply.
+- regulator-state-mem sub-root node for Suspend-to-RAM mode
+  : suspend to memory, the device goes to sleep, but all data stored in memory,
+  only some external interrupt can wake the device.
+- regulator-state-disk sub-root node for Suspend-to-DISK mode
+  : suspend to disk, this state operates similarly to Suspend-to-RAM,
+  but includes a final step of writing memory contents to disk.
+- regulator-state-[mem/disk] node has following common properties:
+        - regulator-on-in-suspend: regulator should be on in suspend state.
+        - regulator-off-in-suspend: regulator should be off in suspend state.
+        - regulator-suspend-microvolt: regulator should be set to this voltage
+          in suspend.
+        - regulator-mode: operating mode in the given suspend state.
+          The set of possible operating modes depends on the capabilities of
+          every hardware so the valid modes are documented on each regulator
+          device tree binding document.
+- regulator-initial-mode: initial operating mode. The set of possible operating
+  modes depends on the capabilities of every hardware so each device binding
+  documentation explains which values the regulator supports.
 
 Deprecated properties:
 - regulator-compatible: If a regulator chip contains multiple
@@ -34,6 +52,10 @@ Example:
                 regulator-max-microvolt = <2500000>;
                 regulator-always-on;
                 vin-supply = <&vin>;
+
+                regulator-state-mem {
+                        regulator-on-in-suspend;
+                };
         };
 
 Regulator Consumers:
diff --git a/Documentation/devicetree/bindings/regulator/sky81452-regulator.txt b/Documentation/devicetree/bindings/regulator/sky81452-regulator.txt
index 882455e9b36d..f9acbc1f3c6b 100644
--- a/Documentation/devicetree/bindings/regulator/sky81452-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/sky81452-regulator.txt
@@ -1,6 +1,7 @@
 SKY81452 voltage regulator
 
 Required properties:
+- regulator node named lout.
 - any required generic properties defined in regulator.txt
 
 Optional properties:
@@ -9,8 +10,9 @@ Optional properties:
 Example:
 
         regulator {
-                /* generic regulator properties */
-                regulator-name = "touch_en";
-                regulator-min-microvolt = <4500000>;
-                regulator-max-microvolt = <8000000>;
+                lout {
+                        regulator-name = "sky81452-lout";
+                        regulator-min-microvolt = <4500000>;
+                        regulator-max-microvolt = <8000000>;
+                };
         };
diff --git a/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt b/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
new file mode 100644
index 000000000000..54ae9f747e45
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
@@ -0,0 +1,42 @@
+STMicroelectronics STi family Sysconfig Picophy SoftReset Controller
+=============================================================================
+
+This binding describes a reset controller device that is used to enable and
+disable on-chip PicoPHY USB2 phy(s) using "softreset" control bits found in
+the STi family SoC system configuration registers.
+
+The actual action taken when softreset is asserted is hardware dependent.
+However, when asserted it may not be possible to access the hardware's
+registers and after an assert/deassert sequence the hardware's previous state
+may no longer be valid.
+
+Please refer to Documentation/devicetree/bindings/reset/reset.txt
+for common reset controller binding usage.
+
+Required properties:
+- compatible: Should be "st,stih407-picophyreset"
+- #reset-cells: 1, see below
+
+Example:
+
+        picophyreset: picophyreset-controller {
+                compatible = "st,stih407-picophyreset";
+                #reset-cells = <1>;
+        };
+
+Specifying picophyreset control of devices
+=======================================
+
+Device nodes should specify the reset channel required in their "resets"
+property, containing a phandle to the picophyreset device node and an
+index specifying which channel to use, as described in
+Documentation/devicetree/bindings/reset/reset.txt.
+
+Example:
+
+        usb2_picophy0: usbpicophy@0 {
+                resets = <&picophyreset STIH407_PICOPHY0_RESET>;
+        };
+
+Macro definitions for the supported reset channels can be found in:
+include/dt-bindings/reset-controller/stih407-resets.h
diff --git a/Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt b/Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt
new file mode 100644
index 000000000000..6ae79d1843f3
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt
@@ -0,0 +1,23 @@
+Atmel AT91SAM9260 Real Time Timer
+
+Required properties:
+- compatible: should be: "atmel,at91sam9260-rtt"
+- reg: should encode the memory region of the RTT controller
+- interrupts: rtt alarm/event interrupt
+- clocks: should contain the 32 KHz slow clk that will drive the RTT block.
+- atmel,rtt-rtc-time-reg: should encode the GPBR register used to store
+        the time base when the RTT is used as an RTC.
+        The first cell should point to the GPBR node and the second one
+        encode the offset within the GPBR block (or in other words, the
+        GPBR register used to store the time base).
+
+
+Example:
+
+rtt@fffffd20 {
+        compatible = "atmel,at91sam9260-rtt";
+        reg = <0xfffffd20 0x10>;
+        interrupts = <1 4 7>;
+        clocks = <&clk32k>;
+        atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
+};
diff --git a/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/Documentation/devicetree/bindings/rtc/rtc-omap.txt
index 5a0f02d34d95..4ba4dbd34289 100644
--- a/Documentation/devicetree/bindings/rtc/rtc-omap.txt
+++ b/Documentation/devicetree/bindings/rtc/rtc-omap.txt
@@ -5,11 +5,17 @@ Required properties:
         - "ti,da830-rtc"  - for RTC IP used similar to that on DA8xx SoC family.
         - "ti,am3352-rtc" - for RTC IP used similar to that on AM335x SoC family.
                             This RTC IP has special WAKE-EN Register to enable
-                            Wakeup generation for event Alarm.
+                            Wakeup generation for event Alarm. It can also be
+                            used to control an external PMIC via the
+                            pmic_power_en pin.
 - reg: Address range of rtc register set
 - interrupts: rtc timer, alarm interrupts in order
 - interrupt-parent: phandle for the interrupt controller
 
+Optional properties:
+- system-power-controller: whether the rtc is controlling the system power
+  through pmic_power_en
+
 Example:
 
 rtc@1c23000 {
@@ -18,4 +24,5 @@ rtc@1c23000 {
         interrupts = <19
                       19>;
         interrupt-parent = <&intc>;
+        system-power-controller;
 };
diff --git a/Documentation/devicetree/bindings/rtc/rtc-opal.txt b/Documentation/devicetree/bindings/rtc/rtc-opal.txt
new file mode 100644
index 000000000000..af87e5ecac54
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/rtc-opal.txt
@@ -0,0 +1,16 @@
+IBM OPAL real-time clock
+------------------------
+
+Required properties:
+- comapatible: Should be "ibm,opal-rtc"
+
+Optional properties:
+- has-tpo: Decides if the wakeup is supported or not.
+
+Example:
+        rtc {
+                compatible = "ibm,opal-rtc";
+                has-tpo;
+                phandle = <0x10000029>;
+                linux,phandle = <0x10000029>;
+        };
diff --git a/Documentation/devicetree/bindings/serial/bcm63xx-uart.txt b/Documentation/devicetree/bindings/serial/bcm63xx-uart.txt
new file mode 100644
index 000000000000..5c52e5eef16d
--- /dev/null
+++ b/Documentation/devicetree/bindings/serial/bcm63xx-uart.txt
@@ -0,0 +1,30 @@
+* BCM63xx UART
+
+Required properties:
+
+- compatible: "brcm,bcm6345-uart"
+
+- reg: The base address of the UART register bank.
+
+- interrupts: A single interrupt specifier.
+
+- clocks: Clock driving the hardware; used to figure out the baud rate
+  divisor.
+
+Example:
+
+        uart0: serial@14e00520 {
+                compatible = "brcm,bcm6345-uart";
+                reg = <0x14e00520 0x18>;
+                interrupt-parent = <&periph_intc>;
+                interrupts = <2>;
+                clocks = <&periph_clk>;
+        };
+
+        clocks {
+                periph_clk: periph_clk@0 {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <54000000>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt b/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt
index 59a40f18d551..7c408c87e613 100644
--- a/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt
+++ b/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt
@@ -11,8 +11,13 @@ Required properties:
 - dma-names: "rx" for RX channel, "tx" for TX channel.
 
 Optional properties:
-- fsl,uart-has-rtscts : Indicate the UART has RTS and CTS lines,
+- fsl,uart-has-rtscts : Indicate the UART has RTS and CTS lines
+  for hardware flow control,
         it also means you enable the DMA support for this UART.
+- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD
+  line respectively. It will use specified PIO instead of the peripheral
+  function pin for the USART feature.
+  If unsure, don't specify this property.
 
 Example:
 auart0: serial@8006a000 {
@@ -21,6 +26,9 @@ auart0: serial@8006a000 {
         interrupts = <112>;
         dmas = <&dma_apbx 8>, <&dma_apbx 9>;
         dma-names = "rx", "tx";
+        cts-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+        dsr-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+        dcd-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
 };
 
 Note: Each auart port should have an alias correctly numbered in "aliases"
diff --git a/Documentation/devicetree/bindings/serial/of-serial.txt b/Documentation/devicetree/bindings/serial/of-serial.txt
index 8c4fd0332028..b52b98234b9b 100644
--- a/Documentation/devicetree/bindings/serial/of-serial.txt
+++ b/Documentation/devicetree/bindings/serial/of-serial.txt
@@ -10,6 +10,7 @@ Required properties:
         - "ns16850"
         - "nvidia,tegra20-uart"
         - "nxp,lpc3220-uart"
+        - "ralink,rt2880-uart"
         - "ibm,qpace-nwp-serial"
         - "altr,16550-FIFO32"
         - "altr,16550-FIFO64"
diff --git a/Documentation/devicetree/bindings/serial/pl011.txt b/Documentation/devicetree/bindings/serial/pl011.txt
index 5d2e840ae65c..ba3ecb8cb5a1 100644
--- a/Documentation/devicetree/bindings/serial/pl011.txt
+++ b/Documentation/devicetree/bindings/serial/pl011.txt
@@ -6,12 +6,46 @@ Required properties:
 - interrupts: exactly one interrupt specifier
 
 Optional properties:
-- pinctrl: When present, must have one state named "sleep"
-           and one state named "default"
-- clocks:  When present, must refer to exactly one clock named
+- pinctrl:
+           When present, must have one state named "default",
+           and may contain a second name named "sleep". The former
+           state sets up pins for ordinary operation whereas
+           the latter state will put the associated pins to sleep
+           when the UART is unused
+- clocks:
+           When present, the first clock listed must correspond to
+           the clock named UARTCLK on the IP block, i.e. the clock
+           to the external serial line, whereas the second clock
+           must correspond to the PCLK clocking the internal logic
+           of the block. Just listing one clock (the first one) is
+           deprecated.
+- clocks-names:
+           When present, the first clock listed must be named
+           "uartclk" and the second clock listed must be named
            "apb_pclk"
-- dmas:    When present, may have one or two dma channels.
+- dmas: 
+           When present, may have one or two dma channels.
            The first one must be named "rx", the second one
            must be named "tx".
+- auto-poll:
+           Enables polling when using RX DMA.
+- poll-rate-ms:
+           Rate at which poll occurs when auto-poll is set,
+           default 100ms.
+- poll-timeout-ms:
+           Poll timeout when auto-poll is set, default
+           3000ms.
 
 See also bindings/arm/primecell.txt
+
+Example:
+
+uart@80120000 {
+        compatible = "arm,pl011", "arm,primecell";
+        reg = <0x80120000 0x1000>;
+        interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
+        dmas = <&dma 13 0 0x2>, <&dma 13 0 0x0>;
+        dma-names = "rx", "tx";
+        clocks = <&foo_clk>, <&bar_clk>;
+        clock-names = "uartclk", "apb_pclk";
+};
diff --git a/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt b/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt
index ffa5b784c66e..a2114c217376 100644
--- a/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt
+++ b/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt
@@ -27,27 +27,52 @@ Optional properties:
 - dmas: Should contain dma specifiers for transmit and receive channels
 - dma-names: Should contain "tx" for transmit and "rx" for receive channels
 
+Note: Aliases may be defined to ensure the correct ordering of the UARTs.
+The alias serialN will result in the UART being assigned port N.  If any
+serialN alias exists, then an alias must exist for each enabled UART.  The
+serialN aliases should be in a .dts file instead of in a .dtsi file.
+
 Examples:
 
-A uartdm v1.4 device with dma capabilities.
-
-serial@f991e000 {
-        compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
-        reg = <0xf991e000 0x1000>;
-        interrupts = <0 108 0x0>;
-        clocks = <&blsp1_uart2_apps_cxc>, <&blsp1_ahb_cxc>;
-        clock-names = "core", "iface";
-        dmas = <&dma0 0>, <&dma0 1>;
-        dma-names = "tx", "rx";
-};
-
-A uartdm v1.3 device without dma capabilities and part of a GSBI complex.
-
-serial@19c40000 {
-        compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-        reg = <0x19c40000 0x1000>,
-              <0x19c00000 0x1000>;
-        interrupts = <0 195 0x0>;
-        clocks = <&gsbi5_uart_cxc>, <&gsbi5_ahb_cxc>;
-        clock-names = "core", "iface";
-};
+- A uartdm v1.4 device with dma capabilities.
+
+        serial@f991e000 {
+                compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
+                reg = <0xf991e000 0x1000>;
+                interrupts = <0 108 0x0>;
+                clocks = <&blsp1_uart2_apps_cxc>, <&blsp1_ahb_cxc>;
+                clock-names = "core", "iface";
+                dmas = <&dma0 0>, <&dma0 1>;
+                dma-names = "tx", "rx";
+        };
+
+- A uartdm v1.3 device without dma capabilities and part of a GSBI complex.
+
+        serial@19c40000 {
+                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+                reg = <0x19c40000 0x1000>,
+                <0x19c00000 0x1000>;
+                interrupts = <0 195 0x0>;
+                clocks = <&gsbi5_uart_cxc>, <&gsbi5_ahb_cxc>;
+                clock-names = "core", "iface";
+        };
+
+- serialN alias.
+
+        aliases {
+                serial0 = &uarta;
+                serial1 = &uartc;
+                serial2 = &uartb;
+        };
+
+        uarta: serial@12490000 {
+                status = "ok";
+        };
+
+        uartb: serial@16340000 {
+                status = "ok";
+        };
+
+        uartc: serial@1a240000 {
+                status = "ok";
+        };
diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
index b3556609a06f..ae73bb0e9ad9 100644
--- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
+++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
@@ -4,8 +4,7 @@ Required properties:
 
   - compatible: Must contain one of the following:
 
-    - "renesas,scifa-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFA compatible UART.
-    - "renesas,scifb-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFB compatible UART.
+    - "renesas,scif-r7s72100" for R7S72100 (RZ/A1H) SCIF compatible UART.
     - "renesas,scifa-r8a73a4" for R8A73A4 (R-Mobile APE6) SCIFA compatible UART.
     - "renesas,scifb-r8a73a4" for R8A73A4 (R-Mobile APE6) SCIFB compatible UART.
     - "renesas,scifa-r8a7740" for R8A7740 (R-Mobile A1) SCIFA compatible UART.
@@ -20,6 +19,12 @@ Required properties:
     - "renesas,scifa-r8a7791" for R8A7791 (R-Car M2) SCIFA compatible UART.
     - "renesas,scifb-r8a7791" for R8A7791 (R-Car M2) SCIFB compatible UART.
     - "renesas,hscif-r8a7791" for R8A7791 (R-Car M2) HSCIF compatible UART.
+    - "renesas,scif-r8a7794" for R8A7794 (R-Car E2) SCIF compatible UART.
+    - "renesas,scifa-r8a7794" for R8A7794 (R-Car E2) SCIFA compatible UART.
+    - "renesas,scifb-r8a7794" for R8A7794 (R-Car E2) SCIFB compatible UART.
+    - "renesas,hscif-r8a7794" for R8A7794 (R-Car E2) HSCIF compatible UART.
+    - "renesas,scifa-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFA compatible UART.
+    - "renesas,scifb-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFB compatible UART.
     - "renesas,scif" for generic SCIF compatible UART.
     - "renesas,scifa" for generic SCIFA compatible UART.
     - "renesas,scifb" for generic SCIFB compatible UART.
diff --git a/Documentation/devicetree/bindings/serial/sirf-uart.txt b/Documentation/devicetree/bindings/serial/sirf-uart.txt
index a2dfc6522a91..3acdd969edf1 100644
--- a/Documentation/devicetree/bindings/serial/sirf-uart.txt
+++ b/Documentation/devicetree/bindings/serial/sirf-uart.txt
@@ -1,7 +1,9 @@
 * CSR SiRFprimaII/atlasVI Universal Synchronous Asynchronous Receiver/Transmitter *
 
 Required properties:
-- compatible : Should be "sirf,prima2-uart" or "sirf, prima2-usp-uart"
+- compatible : Should be "sirf,prima2-uart", "sirf, prima2-usp-uart",
+                "sirf,marco-uart" or "sirf,marco-bt-uart" which means
+                uart located in BT module and used for BT.
 - reg : Offset and length of the register set for the device
 - interrupts : Should contain uart interrupt
 - fifosize : Should define hardware rx/tx fifo size
@@ -31,3 +33,15 @@ usp@b0090000 {
         rts-gpios = <&gpio 15 0>;
         cts-gpios = <&gpio 46 0>;
 };
+
+for uart use in BT module,
+uart6: uart@11000000 {
+        cell-index = <6>;
+        compatible = "sirf,marco-bt-uart", "sirf,marco-uart";
+        reg = <0x11000000 0x1000>;
+        interrupts = <0 100 0>;
+        clocks = <&clks 138>, <&clks 140>, <&clks 141>;
+        clock-names = "uart", "general", "noc";
+        fifosize = <128>;
+        status = "disabled";
+}
diff --git a/Documentation/devicetree/bindings/soc/fsl/bman-portals.txt b/Documentation/devicetree/bindings/soc/fsl/bman-portals.txt
new file mode 100644
index 000000000000..2a00e14e11e0
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/fsl/bman-portals.txt
@@ -0,0 +1,56 @@
+QorIQ DPAA Buffer Manager Portals Device Tree Binding
+
+Copyright (C) 2008 - 2014 Freescale Semiconductor Inc.
+
+CONTENTS
+
+        - BMan Portal
+        - Example
+
+BMan Portal Node
+
+Portals are memory mapped interfaces to BMan that allow low-latency, lock-less
+interaction by software running on processor cores, accelerators and network
+interfaces with the BMan
+
+PROPERTIES
+
+- compatible
+        Usage:          Required
+        Value type:     <stringlist>
+        Definition:     Must include "fsl,bman-portal-<hardware revision>"
+                        May include "fsl,<SoC>-bman-portal" or "fsl,bman-portal"
+
+- reg
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Definition:     Two regions. The first is the cache-enabled region of
+                        the portal. The second is the cache-inhibited region of
+                        the portal
+
+- interrupts
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Definition:     Standard property
+
+EXAMPLE
+
+The example below shows a (P4080) BMan portals container/bus node with two portals
+
+        bman-portals@ff4000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                ranges = <0 0xf 0xf4000000 0x200000>;
+
+                bman-portal@0 {
+                        compatible = "fsl,bman-portal-1.0.0", "fsl,bman-portal";
+                        reg = <0x0 0x4000>, <0x100000 0x1000>;
+                        interrupts = <105 2 0 0>;
+                };
+                bman-portal@4000 {
+                        compatible = "fsl,bman-portal-1.0.0", "fsl,bman-portal";
+                        reg = <0x4000 0x4000>, <0x101000 0x1000>;
+                        interrupts = <107 2 0 0>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/soc/fsl/bman.txt b/Documentation/devicetree/bindings/soc/fsl/bman.txt
new file mode 100644
index 000000000000..9f80bf8709ac
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/fsl/bman.txt
@@ -0,0 +1,125 @@
+QorIQ DPAA Buffer Manager Device Tree Bindings
+
+Copyright (C) 2008 - 2014 Freescale Semiconductor Inc.
+
+CONTENTS
+
+        - BMan Node
+        - BMan Private Memory Node
+        - Example
+
+BMan Node
+
+The Buffer Manager is part of the Data-Path Acceleration Architecture (DPAA).
+BMan supports hardware allocation and deallocation of buffers belonging to pools
+originally created by software with configurable depletion thresholds. This
+binding covers the CCSR space programming model
+
+PROPERTIES
+
+- compatible
+        Usage:          Required
+        Value type:     <stringlist>
+        Definition:     Must include "fsl,bman"
+                        May include "fsl,<SoC>-bman"
+
+- reg
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Definition:     Registers region within the CCSR address space
+
+The BMan revision information is located in the BMAN_IP_REV_1/2 registers which
+are located at offsets 0xbf8 and 0xbfc
+
+- interrupts
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Definition:     Standard property. The error interrupt
+
+- fsl,liodn
+        Usage:          See pamu.txt
+        Value type:     <prop-encoded-array>
+        Definition:     PAMU property used for static LIODN assignment
+
+- fsl,iommu-parent
+        Usage:          See pamu.txt
+        Value type:     <phandle>
+        Definition:     PAMU property used for dynamic LIODN assignment
+
+        For additional details about the PAMU/LIODN binding(s) see pamu.txt
+
+Devices connected to a BMan instance via Direct Connect Portals (DCP) must link
+to the respective BMan instance
+
+- fsl,bman
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Description:    List of phandle and DCP index pairs, to the BMan instance
+                        to which this device is connected via the DCP
+
+BMan Private Memory Node
+
+BMan requires a contiguous range of physical memory used for the backing store
+for BMan Free Buffer Proxy Records (FBPR). This memory is reserved/allocated as a
+node under the /reserved-memory node
+
+The BMan FBPR memory node must be named "bman-fbpr"
+
+PROPERTIES
+
+- compatible
+        Usage:          required
+        Value type:     <stringlist>
+        Definition:     Must inclide "fsl,bman-fbpr"
+
+The following constraints are relevant to the FBPR private memory:
+        - The size must be 2^(size + 1), with size = 11..33. That is 4 KiB to
+          16 GiB
+        - The alignment must be a muliptle of the memory size
+
+The size of the FBPR must be chosen by observing the hardware features configured
+via the Reset Configuration Word (RCW) and that are relevant to a specific board
+(e.g. number of MAC(s) pinned-out, number of offline/host command FMan ports,
+etc.). The size configured in the DT must reflect the hardware capabilities and
+not the specific needs of an application
+
+For additional details about reserved memory regions see reserved-memory.txt
+
+EXAMPLE
+
+The example below shows a BMan FBPR dynamic allocation memory node
+
+        reserved-memory {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                bman_fbpr: bman-fbpr {
+                        compatible = "fsl,bman-fbpr";
+                        alloc-ranges = <0 0 0xf 0xffffffff>;
+                        size = <0 0x1000000>;
+                        alignment = <0 0x1000000>;
+                };
+        };
+
+The example below shows a (P4080) BMan CCSR-space node
+
+        crypto@300000 {
+                ...
+                fsl,bman = <&bman, 2>;
+                ...
+        };
+
+        bman: bman@31a000 {
+                compatible = "fsl,bman";
+                reg = <0x31a000 0x1000>;
+                interrupts = <16 2 1 2>;
+                fsl,liodn = <0x17>;
+                memory-region = <&bman_fbpr>;
+        };
+
+        fman@400000 {
+                ...
+                fsl,bman = <&bman, 0>;
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/soc/fsl/qman-portals.txt b/Documentation/devicetree/bindings/soc/fsl/qman-portals.txt
new file mode 100644
index 000000000000..48c4dae5d6f9
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/fsl/qman-portals.txt
@@ -0,0 +1,154 @@
+QorIQ DPAA Queue Manager Portals Device Tree Binding
+
+Copyright (C) 2008 - 2014 Freescale Semiconductor Inc.
+
+CONTENTS
+
+        - QMan Portal
+        - QMan Pool Channel
+        - Example
+
+QMan Portal Node
+
+Portals are memory mapped interfaces to QMan that allow low-latency, lock-less
+interaction by software running on processor cores, accelerators and network
+interfaces with the QMan
+
+PROPERTIES
+
+- compatible
+        Usage:          Required
+        Value type:     <stringlist>
+        Definition:     Must include "fsl,qman-portal-<hardware revision>"
+                        May include "fsl,<SoC>-qman-portal" or "fsl,qman-portal"
+
+- reg
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Definition:     Two regions. The first is the cache-enabled region of
+                        the portal. The second is the cache-inhibited region of
+                        the portal
+
+- interrupts
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Definition:     Standard property
+
+- fsl,liodn
+        Usage:          See pamu.txt
+        Value type:     <prop-encoded-array>
+        Definition:     Two LIODN(s). DQRR LIODN (DLIODN) and Frame LIODN
+                        (FLIODN)
+
+- fsl,iommu-parent
+        Usage:          See pamu.txt
+        Value type:     <phandle>
+        Definition:     PAMU property used for dynamic LIODN assignment
+
+        For additional details about the PAMU/LIODN binding(s) see pamu.txt
+
+- fsl,qman-channel-id
+        Usage:          Required
+        Value type:     <u32>
+        Definition:     The hardware index of the channel. This can also be
+                        determined by dividing any of the channel's 8 work queue
+                        IDs by 8
+
+In addition to these properties the qman-portals should have sub-nodes to
+represent the HW devices/portals that are connected to the software portal
+described here
+
+The currently supported sub-nodes are:
+        * fman0
+        * fman1
+        * pme
+        * crypto
+
+These subnodes should have the following properties:
+
+- fsl,liodn
+        Usage:          See pamu.txt
+        Value type:     <prop-encoded-array>
+        Definition:     PAMU property used for static LIODN assignment
+
+- fsl,iommu-parent
+        Usage:          See pamu.txt
+        Value type:     <phandle>
+        Definition:     PAMU property used for dynamic LIODN assignment
+
+- dev-handle
+        Usage:          Required
+        Value type:     <phandle>
+        Definition:     The phandle to the particular hardware device that this
+                        portal is connected to.
+
+DPAA QMan Pool Channel Nodes
+
+Pool Channels are defined with the following properties.
+
+PROPERTIES
+
+- compatible
+        Usage:          Required
+        Value type:     <stringlist>
+        Definition:     Must include "fsl,qman-pool-channel"
+                        May include "fsl,<SoC>-qman-pool-channel"
+
+- fsl,qman-channel-id
+        Usage:          Required
+        Value type:     <u32>
+        Definition:     The hardware index of the channel. This can also be
+                        determined by dividing any of the channel's 8 work queue
+                        IDs by 8
+
+EXAMPLE
+
+The example below shows a (P4080) QMan portals container/bus node with two portals
+
+        qman-portals@ff4200000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                ranges = <0 0xf 0xf4200000 0x200000>;
+
+                qman-portal@0 {
+                        compatible = "fsl,qman-portal-1.2.0", "fsl,qman-portal";
+                        reg = <0 0x4000>, <0x100000 0x1000>;
+                        interrupts = <104 2 0 0>;
+                        fsl,liodn = <1 2>;
+                        fsl,qman-channel-id = <0>;
+
+                        fman0 {
+                                fsl,liodn = <0x21>;
+                                dev-handle = <&fman0>;
+                        };
+                        fman1 {
+                                fsl,liodn = <0xa1>;
+                                dev-handle = <&fman1>;
+                        };
+                        crypto {
+                                fsl,liodn = <0x41 0x66>;
+                                dev-handle = <&crypto>;
+                        };
+                };
+                qman-portal@4000 {
+                        compatible = "fsl,qman-portal-1.2.0", "fsl,qman-portal";
+                        reg = <0x4000 0x4000>, <0x101000 0x1000>;
+                        interrupts = <106 2 0 0>;
+                        fsl,liodn = <3 4>;
+                        fsl,qman-channel-id = <1>;
+
+                        fman0 {
+                                fsl,liodn = <0x22>;
+                                dev-handle = <&fman0>;
+                        };
+                        fman1 {
+                                fsl,liodn = <0xa2>;
+                                dev-handle = <&fman1>;
+                        };
+                        crypto {
+                                fsl,liodn = <0x42 0x67>;
+                                dev-handle = <&crypto>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/soc/fsl/qman.txt b/Documentation/devicetree/bindings/soc/fsl/qman.txt
new file mode 100644
index 000000000000..063e3a0b9d04
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/fsl/qman.txt
@@ -0,0 +1,165 @@
+QorIQ DPAA Queue Manager Device Tree Binding
+
+Copyright (C) 2008 - 2014 Freescale Semiconductor Inc.
+
+CONTENTS
+
+        - QMan Node
+        - QMan Private Memory Nodes
+        - Example
+
+QMan Node
+
+The Queue Manager is part of the Data-Path Acceleration Architecture (DPAA). QMan
+supports queuing and QoS scheduling of frames to CPUs, network interfaces and
+DPAA logic modules, maintains packet ordering within flows. Besides providing
+flow-level queuing, is also responsible for congestion management functions such
+as RED/WRED, congestion notifications and tail discards. This binding covers the
+CCSR space programming model
+
+PROPERTIES
+
+- compatible
+        Usage:          Required
+        Value type:     <stringlist>
+        Definition:     Must include "fsl,qman"
+                        May include "fsl,<SoC>-qman"
+
+- reg
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Definition:     Registers region within the CCSR address space
+
+The QMan revision information is located in the QMAN_IP_REV_1/2 registers which
+are located at offsets 0xbf8 and 0xbfc
+
+- interrupts
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Definition:     Standard property. The error interrupt
+
+- fsl,liodn
+        Usage:          See pamu.txt
+        Value type:     <prop-encoded-array>
+        Definition:     PAMU property used for static LIODN assignment
+
+- fsl,iommu-parent
+        Usage:          See pamu.txt
+        Value type:     <phandle>
+        Definition:     PAMU property used for dynamic LIODN assignment
+
+        For additional details about the PAMU/LIODN binding(s) see pamu.txt
+
+- clocks
+        Usage:          See clock-bindings.txt and qoriq-clock.txt
+        Value type:     <prop-encoded-array>
+        Definition:     Reference input clock. Its frequency is half of the
+                        platform clock
+
+Devices connected to a QMan instance via Direct Connect Portals (DCP) must link
+to the respective QMan instance
+
+- fsl,qman
+        Usage:          Required
+        Value type:     <prop-encoded-array>
+        Description:    List of phandle and DCP index pairs, to the QMan instance
+                        to which this device is connected via the DCP
+
+QMan Private Memory Nodes
+
+QMan requires two contiguous range of physical memory used for the backing store
+for QMan Frame Queue Descriptor (FQD) and Packed Frame Descriptor Record (PFDR).
+This memory is reserved/allocated as a nodes under the /reserved-memory node
+
+The QMan FQD memory node must be named "qman-fqd"
+
+PROPERTIES
+
+- compatible
+        Usage:          required
+        Value type:     <stringlist>
+        Definition:     Must inclide "fsl,qman-fqd"
+
+The QMan PFDR memory node must be named "qman-pfdr"
+
+PROPERTIES
+
+- compatible
+        Usage:          required
+        Value type:     <stringlist>
+        Definition:     Must inclide "fsl,qman-pfdr"
+
+The following constraints are relevant to the FQD and PFDR private memory:
+        - The size must be 2^(size + 1), with size = 11..29. That is 4 KiB to
+          1 GiB
+        - The alignment must be a muliptle of the memory size
+
+The size of the FQD and PFDP must be chosen by observing the hardware features
+configured via the Reset Configuration Word (RCW) and that are relevant to a
+specific board (e.g. number of MAC(s) pinned-out, number of offline/host command
+FMan ports, etc.). The size configured in the DT must reflect the hardware
+capabilities and not the specific needs of an application
+
+For additional details about reserved memory regions see reserved-memory.txt
+
+EXAMPLE
+
+The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes
+
+        reserved-memory {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                qman_fqd: qman-fqd {
+                        compatible = "fsl,qman-fqd";
+                        alloc-ranges = <0 0 0xf 0xffffffff>;
+                        size = <0 0x400000>;
+                        alignment = <0 0x400000>;
+                };
+                qman_pfdr: qman-pfdr {
+                        compatible = "fsl,qman-pfdr";
+                        alloc-ranges = <0 0 0xf 0xffffffff>;
+                        size = <0 0x2000000>;
+                        alignment = <0 0x2000000>;
+                };
+        };
+
+The example below shows a (P4080) QMan CCSR-space node
+
+        clockgen: global-utilities@e1000 {
+                ...
+                sysclk: sysclk {
+                        ...
+                };
+                ...
+                platform_pll: platform-pll@c00 {
+                        #clock-cells = <1>;
+                        reg = <0xc00 0x4>;
+                        compatible = "fsl,qoriq-platform-pll-1.0";
+                        clocks = <&sysclk>;
+                        clock-output-names = "platform-pll", "platform-pll-div2";
+                };
+                ...
+        };
+
+        crypto@300000 {
+                ...
+                fsl,qman = <&qman, 2>;
+                ...
+        };
+
+        qman: qman@318000 {
+                compatible = "fsl,qman";
+                reg = <0x318000 0x1000>;
+                interrupts = <16 2 1 3>
+                fsl,liodn = <0x16>;
+                memory-region = <&qman_fqd &qman_pfdr>;
+                clocks = <&platform_pll 1>;
+        };
+
+        fman@400000 {
+                ...
+                fsl,qman = <&qman, 0>;
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/sound/arndale.txt b/Documentation/devicetree/bindings/sound/arndale.txt
new file mode 100644
index 000000000000..0e76946385ae
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/arndale.txt
@@ -0,0 +1,24 @@
+Audio Binding for Arndale boards
+
+Required properties:
+- compatible : Can be the following,
+                        "samsung,arndale-rt5631"
+
+- samsung,audio-cpu: The phandle of the Samsung I2S controller
+- samsung,audio-codec: The phandle of the audio codec
+
+Optional:
+- samsung,model: The name of the sound-card
+
+Arndale Boards has many audio daughter cards, one of them is
+rt5631/alc5631. Below example shows audio bindings for rt5631/
+alc5631 based codec.
+
+Example:
+
+sound {
+                compatible = "samsung,arndale-rt5631";
+
+                samsung,audio-cpu = <&i2s0>
+                samsung,audio-codec = <&rt5631>;
+};
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
index 60ca07996458..46bc9829c71a 100644
--- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
@@ -32,7 +32,7 @@ Optional properties:
 - rx-num-evt : FIFO levels.
 - sram-size-playback : size of sram to be allocated during playback
 - sram-size-capture  : size of sram to be allocated during capture
-- interrupts : Interrupt numbers for McASP, currently not used by the driver
+- interrupts : Interrupt numbers for McASP
 - interrupt-names : Known interrupt names are "tx" and "rx"
 - pinctrl-0: Should specify pin control group used for this controller.
 - pinctrl-names: Should contain only one value - "default", for more details
diff --git a/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt b/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
index 0d7985c864af..6dfa88c4dc1e 100644
--- a/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
+++ b/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
@@ -1,11 +1,16 @@
 Audio complex for Eukrea boards with tlv320aic23 codec.
 
 Required properties:
-- compatible : "eukrea,asoc-tlv320"
-- eukrea,model : The user-visible name of this sound complex.
-- ssi-controller : The phandle of the SSI controller.
-- fsl,mux-int-port : The internal port of the i.MX audio muxer (AUDMUX).
-- fsl,mux-ext-port : The external port of the i.MX audio muxer.
+
+  - compatible          : "eukrea,asoc-tlv320"
+
+  - eukrea,model        : The user-visible name of this sound complex.
+
+  - ssi-controller      : The phandle of the SSI controller.
+
+  - fsl,mux-int-port    : The internal port of the i.MX audio muxer (AUDMUX).
+
+  - fsl,mux-ext-port    : The external port of the i.MX audio muxer.
 
 Note: The AUDMUX port numbering should start at 1, which is consistent with
 hardware manual.
diff --git a/Documentation/devicetree/bindings/sound/fsl,esai.txt b/Documentation/devicetree/bindings/sound/fsl,esai.txt
index 52f5b6bf3e8e..d3b6b5f48010 100644
--- a/Documentation/devicetree/bindings/sound/fsl,esai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,esai.txt
@@ -7,37 +7,39 @@ other DSPs. It has up to six transmitters and four receivers.
 
 Required properties:
 
-  - compatible : Compatible list, must contain "fsl,imx35-esai" or
-                 "fsl,vf610-esai"
+  - compatible          : Compatible list, must contain "fsl,imx35-esai" or
+                          "fsl,vf610-esai"
 
-  - reg : Offset and length of the register set for the device.
+  - reg                 : Offset and length of the register set for the device.
 
-  - interrupts : Contains the spdif interrupt.
+  - interrupts          : Contains the spdif interrupt.
 
-  - dmas : Generic dma devicetree binding as described in
-  Documentation/devicetree/bindings/dma/dma.txt.
+  - dmas                : Generic dma devicetree binding as described in
+                          Documentation/devicetree/bindings/dma/dma.txt.
 
-  - dma-names : Two dmas have to be defined, "tx" and "rx".
+  - dma-names           : Two dmas have to be defined, "tx" and "rx".
 
-  - clocks: Contains an entry for each entry in clock-names.
+  - clocks              : Contains an entry for each entry in clock-names.
 
-  - clock-names : Includes the following entries:
-        "core"          The core clock used to access registers
-        "extal"         The esai baud clock for esai controller used to derive
-                        HCK, SCK and FS.
-        "fsys"          The system clock derived from ahb clock used to derive
-                        HCK, SCK and FS.
+  - clock-names         : Includes the following entries:
+        "core"            The core clock used to access registers
+        "extal"           The esai baud clock for esai controller used to
+                          derive HCK, SCK and FS.
+        "fsys"            The system clock derived from ahb clock used to
+                          derive HCK, SCK and FS.
 
-  - fsl,fifo-depth: The number of elements in the transmit and receive FIFOs.
-    This number is the maximum allowed value for TFCR[TFWM] or RFCR[RFWM].
+  - fsl,fifo-depth      : The number of elements in the transmit and receive
+                          FIFOs. This number is the maximum allowed value for
+                          TFCR[TFWM] or RFCR[RFWM].
 
   - fsl,esai-synchronous: This is a boolean property. If present, indicating
-    that ESAI would work in the synchronous mode, which means all the settings
-    for Receiving would be duplicated from Transmition related registers.
+                          that ESAI would work in the synchronous mode, which
+                          means all the settings for Receiving would be
+                          duplicated from Transmition related registers.
 
-  - big-endian : If this property is absent, the native endian mode will
-    be in use as default, or the big endian mode will be in use for all the
-    device registers.
+  - big-endian          : If this property is absent, the native endian mode
+                          will be in use as default, or the big endian mode
+                          will be in use for all the device registers.
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/sound/fsl,spdif.txt b/Documentation/devicetree/bindings/sound/fsl,spdif.txt
index 3e9e82c8eab3..b5ee32ee3706 100644
--- a/Documentation/devicetree/bindings/sound/fsl,spdif.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,spdif.txt
@@ -6,32 +6,31 @@ a fibre cable.
 
 Required properties:
 
-  - compatible : Compatible list, must contain "fsl,imx35-spdif".
+  - compatible          : Compatible list, must contain "fsl,imx35-spdif".
 
-  - reg : Offset and length of the register set for the device.
+  - reg                 : Offset and length of the register set for the device.
 
-  - interrupts : Contains the spdif interrupt.
+  - interrupts          : Contains the spdif interrupt.
 
-  - dmas : Generic dma devicetree binding as described in
-  Documentation/devicetree/bindings/dma/dma.txt.
+  - dmas                : Generic dma devicetree binding as described in
+                          Documentation/devicetree/bindings/dma/dma.txt.
 
-  - dma-names : Two dmas have to be defined, "tx" and "rx".
+  - dma-names           : Two dmas have to be defined, "tx" and "rx".
 
-  - clocks : Contains an entry for each entry in clock-names.
+  - clocks              : Contains an entry for each entry in clock-names.
 
-  - clock-names : Includes the following entries:
-        "core"          The core clock of spdif controller
-        "rxtx<0-7>"     Clock source list for tx and rx clock.
-                        This clock list should be identical to
-                        the source list connecting to the spdif
-                        clock mux in "SPDIF Transceiver Clock
-                        Diagram" of SoC reference manual. It
-                        can also be referred to TxClk_Source
-                        bit of register SPDIF_STC.
+  - clock-names         : Includes the following entries:
+        "core"            The core clock of spdif controller.
+        "rxtx<0-7>"       Clock source list for tx and rx clock.
+                          This clock list should be identical to the source
+                          list connecting to the spdif clock mux in "SPDIF
+                          Transceiver Clock Diagram" of SoC reference manual.
+                          It can also be referred to TxClk_Source bit of
+                          register SPDIF_STC.
 
-   - big-endian : If this property is absent, the native endian mode will
-   be in use as default, or the big endian mode will be in use for all the
-   device registers.
+   - big-endian         : If this property is absent, the native endian mode
+                          will be in use as default, or the big endian mode
+                          will be in use for all the device registers.
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 4956b14d4b06..044e5d76e2dd 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -5,32 +5,48 @@ which provides a synchronous audio interface that supports fullduplex
 serial interfaces with frame synchronization such as I2S, AC97, TDM, and
 codec/DSP interfaces.
 
-
 Required properties:
-- compatible: Compatible list, contains "fsl,vf610-sai" or "fsl,imx6sx-sai".
-- reg: Offset and length of the register set for the device.
-- clocks: Must contain an entry for each entry in clock-names.
-- clock-names : Must include the "bus" for register access and "mclk1" "mclk2"
-  "mclk3" for bit clock and frame clock providing.
-- dmas : Generic dma devicetree binding as described in
-  Documentation/devicetree/bindings/dma/dma.txt.
-- dma-names : Two dmas have to be defined, "tx" and "rx".
-- pinctrl-names: Must contain a "default" entry.
-- pinctrl-NNN: One property must exist for each entry in pinctrl-names.
-  See ../pinctrl/pinctrl-bindings.txt for details of the property values.
-- big-endian: Boolean property, required if all the FTM_PWM registers
-  are big-endian rather than little-endian.
-- lsb-first: Configures whether the LSB or the MSB is transmitted first for
-  the fifo data. If this property is absent, the MSB is transmitted first as
-  default, or the LSB is transmitted first.
-- fsl,sai-synchronous-rx: This is a boolean property. If present, indicating
-  that SAI will work in the synchronous mode (sync Tx with Rx) which means
-  both the transimitter and receiver will send and receive data by following
-  receiver's bit clocks and frame sync clocks.
-- fsl,sai-asynchronous: This is a boolean property. If present, indicating
-  that SAI will work in the asynchronous mode, which means both transimitter
-  and receiver will send and receive data by following their own bit clocks
-  and frame sync clocks separately.
+
+  - compatible          : Compatible list, contains "fsl,vf610-sai" or
+                          "fsl,imx6sx-sai".
+
+  - reg                 : Offset and length of the register set for the device.
+
+  - clocks              : Must contain an entry for each entry in clock-names.
+
+  - clock-names         : Must include the "bus" for register access and
+                          "mclk1", "mclk2", "mclk3" for bit clock and frame
+                          clock providing.
+  - dmas                : Generic dma devicetree binding as described in
+                          Documentation/devicetree/bindings/dma/dma.txt.
+
+  - dma-names           : Two dmas have to be defined, "tx" and "rx".
+
+  - pinctrl-names       : Must contain a "default" entry.
+
+  - pinctrl-NNN         : One property must exist for each entry in
+                          pinctrl-names. See ../pinctrl/pinctrl-bindings.txt
+                          for details of the property values.
+
+  - big-endian          : Boolean property, required if all the FTM_PWM
+                          registers are big-endian rather than little-endian.
+
+  - lsb-first           : Configures whether the LSB or the MSB is transmitted
+                          first for the fifo data. If this property is absent,
+                          the MSB is transmitted first as default, or the LSB
+                          is transmitted first.
+
+  - fsl,sai-synchronous-rx: This is a boolean property. If present, indicating
+                          that SAI will work in the synchronous mode (sync Tx
+                          with Rx) which means both the transimitter and the
+                          receiver will send and receive data by following
+                          receiver's bit clocks and frame sync clocks.
+
+  - fsl,sai-asynchronous: This is a boolean property. If present, indicating
+                          that SAI will work in the asynchronous mode, which
+                          means both transimitter and receiver will send and
+                          receive data by following their own bit clocks and
+                          frame sync clocks separately.
 
 Note:
 - If both fsl,sai-asynchronous and fsl,sai-synchronous-rx are absent, the
diff --git a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt
index e4acdd891e49..2f89db88fd57 100644
--- a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt
+++ b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt
@@ -1,33 +1,40 @@
 Freescale i.MX audio complex with SGTL5000 codec
 
 Required properties:
-- compatible : "fsl,imx-audio-sgtl5000"
-- model : The user-visible name of this sound complex
-- ssi-controller : The phandle of the i.MX SSI controller
-- audio-codec : The phandle of the SGTL5000 audio codec
-- audio-routing : A list of the connections between audio components.
-  Each entry is a pair of strings, the first being the connection's sink,
-  the second being the connection's source. Valid names could be power
-  supplies, SGTL5000 pins, and the jacks on the board:
-
-  Power supplies:
-   * Mic Bias
-
-  SGTL5000 pins:
-   * MIC_IN
-   * LINE_IN
-   * HP_OUT
-   * LINE_OUT
-
-  Board connectors:
-   * Mic Jack
-   * Line In Jack
-   * Headphone Jack
-   * Line Out Jack
-   * Ext Spk
-
-- mux-int-port : The internal port of the i.MX audio muxer (AUDMUX)
-- mux-ext-port : The external port of the i.MX audio muxer
+
+  - compatible          : "fsl,imx-audio-sgtl5000"
+
+  - model               : The user-visible name of this sound complex
+
+  - ssi-controller      : The phandle of the i.MX SSI controller
+
+  - audio-codec         : The phandle of the SGTL5000 audio codec
+
+  - audio-routing       : A list of the connections between audio components.
+                          Each entry is a pair of strings, the first being the
+                          connection's sink, the second being the connection's
+                          source. Valid names could be power supplies, SGTL5000
+                          pins, and the jacks on the board:
+
+                          Power supplies:
+                           * Mic Bias
+
+                          SGTL5000 pins:
+                           * MIC_IN
+                           * LINE_IN
+                           * HP_OUT
+                           * LINE_OUT
+
+                          Board connectors:
+                           * Mic Jack
+                           * Line In Jack
+                           * Headphone Jack
+                           * Line Out Jack
+                           * Ext Spk
+
+  - mux-int-port        : The internal port of the i.MX audio muxer (AUDMUX)
+
+  - mux-ext-port        : The external port of the i.MX audio muxer
 
 Note: The AUDMUX port numbering should start at 1, which is consistent with
 hardware manual.
diff --git a/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt b/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt
index 7d13479f9c3c..da84a442ccea 100644
--- a/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt
+++ b/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt
@@ -2,23 +2,25 @@ Freescale i.MX audio complex with S/PDIF transceiver
 
 Required properties:
 
-  - compatible : "fsl,imx-audio-spdif"
+  - compatible          : "fsl,imx-audio-spdif"
 
-  - model : The user-visible name of this sound complex
+  - model               : The user-visible name of this sound complex
 
-  - spdif-controller : The phandle of the i.MX S/PDIF controller
+  - spdif-controller    : The phandle of the i.MX S/PDIF controller
 
 
 Optional properties:
 
-  - spdif-out : This is a boolean property. If present, the transmitting
-    function of S/PDIF will be enabled, indicating there's a physical
-    S/PDIF out connector/jack on the board or it's connecting to some
-    other IP block, such as an HDMI encoder/display-controller.
+  - spdif-out           : This is a boolean property. If present, the
+                          transmitting function of S/PDIF will be enabled,
+                          indicating there's a physical S/PDIF out connector
+                          or jack on the board or it's connecting to some
+                          other IP block, such as an HDMI encoder or
+                          display-controller.
 
-  - spdif-in : This is a boolean property. If present, the receiving
-    function of S/PDIF will be enabled, indicating there's a physical
-    S/PDIF in connector/jack on the board.
+  - spdif-in            : This is a boolean property. If present, the receiving
+                          function of S/PDIF will be enabled, indicating there
+                          is a physical S/PDIF in connector/jack on the board.
 
 * Note: At least one of these two properties should be set in the DT binding.
 
diff --git a/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt b/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
index f49450a87890..acea71bee34f 100644
--- a/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
+++ b/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
@@ -1,25 +1,32 @@
 Freescale i.MX audio complex with WM8962 codec
 
 Required properties:
-- compatible : "fsl,imx-audio-wm8962"
-- model : The user-visible name of this sound complex
-- ssi-controller : The phandle of the i.MX SSI controller
-- audio-codec : The phandle of the WM8962 audio codec
-- audio-routing : A list of the connections between audio components.
-  Each entry is a pair of strings, the first being the connection's sink,
-  the second being the connection's source. Valid names could be power
-  supplies, WM8962 pins, and the jacks on the board:
-
-  Power supplies:
-   * Mic Bias
-
-  Board connectors:
-   * Mic Jack
-   * Headphone Jack
-   * Ext Spk
-
-- mux-int-port : The internal port of the i.MX audio muxer (AUDMUX)
-- mux-ext-port : The external port of the i.MX audio muxer
+
+  - compatible          : "fsl,imx-audio-wm8962"
+
+  - model               : The user-visible name of this sound complex
+
+  - ssi-controller      : The phandle of the i.MX SSI controller
+
+  - audio-codec         : The phandle of the WM8962 audio codec
+
+  - audio-routing       : A list of the connections between audio components.
+                          Each entry is a pair of strings, the first being the
+                          connection's sink, the second being the connection's
+                          source. Valid names could be power supplies, WM8962
+                          pins, and the jacks on the board:
+
+                          Power supplies:
+                           * Mic Bias
+
+                          Board connectors:
+                           * Mic Jack
+                           * Headphone Jack
+                           * Ext Spk
+
+  - mux-int-port        : The internal port of the i.MX audio muxer (AUDMUX)
+
+  - mux-ext-port        : The external port of the i.MX audio muxer
 
 Note: The AUDMUX port numbering should start at 1, which is consistent with
 hardware manual.
diff --git a/Documentation/devicetree/bindings/sound/imx-audmux.txt b/Documentation/devicetree/bindings/sound/imx-audmux.txt
index f88a00e54c63..b30a737e209e 100644
--- a/Documentation/devicetree/bindings/sound/imx-audmux.txt
+++ b/Documentation/devicetree/bindings/sound/imx-audmux.txt
@@ -1,18 +1,24 @@
 Freescale Digital Audio Mux (AUDMUX) device
 
 Required properties:
-- compatible : "fsl,imx21-audmux" for AUDMUX version firstly used on i.MX21,
-  or "fsl,imx31-audmux" for the version firstly used on i.MX31.
-- reg : Should contain AUDMUX registers location and length
+
+  - compatible          : "fsl,imx21-audmux" for AUDMUX version firstly used
+                          on i.MX21, or "fsl,imx31-audmux" for the version
+                          firstly used on i.MX31.
+
+  - reg                 : Should contain AUDMUX registers location and length.
 
 An initial configuration can be setup using child nodes.
 
 Required properties of optional child nodes:
-- fsl,audmux-port : Integer of the audmux port that is configured by this
-  child node.
-- fsl,port-config : List of configuration options for the specific port. For
-  imx31-audmux and above, it is a list of tuples <ptcr pdcr>. For
-  imx21-audmux it is a list of pcr values.
+
+  - fsl,audmux-port     : Integer of the audmux port that is configured by this
+                          child node.
+
+  - fsl,port-config     : List of configuration options for the specific port.
+                          For imx31-audmux and above, it is a list of tuples
+                          <ptcr pdcr>. For imx21-audmux it is a list of pcr
+                          values.
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/sound/max98090.txt b/Documentation/devicetree/bindings/sound/max98090.txt
index c454e67f54bb..aa802a274520 100644
--- a/Documentation/devicetree/bindings/sound/max98090.txt
+++ b/Documentation/devicetree/bindings/sound/max98090.txt
@@ -16,6 +16,8 @@ Optional properties:
 
 - clock-names: Should be "mclk"
 
+- maxim,dmic-freq: Frequency at which to clock DMIC
+
 Pins on the device (for linking into audio routes):
 
   * MIC1
diff --git a/Documentation/devicetree/bindings/sound/renesas,fsi.txt b/Documentation/devicetree/bindings/sound/renesas,fsi.txt
index c5be003f413e..0d0ab51105b0 100644
--- a/Documentation/devicetree/bindings/sound/renesas,fsi.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,fsi.txt
@@ -1,11 +1,16 @@
 Renesas FSI
 
 Required properties:
-- compatible                    : "renesas,sh_fsi2" or "renesas,sh_fsi"
+- compatible                    : "renesas,fsi2-<soctype>",
+                                  "renesas,sh_fsi2" or "renesas,sh_fsi" as
+                                  fallback.
+                                  Examples with soctypes are:
+                                    - "renesas,fsi2-r8a7740" (R-Mobile A1)
+                                    - "renesas,fsi2-sh73a0" (SH-Mobile AG5)
 - reg                           : Should contain the register physical address and length
 - interrupts                    : Should contain FSI interrupt
 
-- fsia,spdif-connection         : FSI is connected by S/PDFI
+- fsia,spdif-connection         : FSI is connected by S/PDIF
 - fsia,stream-mode-support      : FSI supports 16bit stream mode.
 - fsia,use-internal-clock       : FSI uses internal clock when master mode.
 
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
index aa697abf337e..2dd690bc19cc 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -1,8 +1,12 @@
 Renesas R-Car sound
 
 Required properties:
-- compatible                    : "renesas,rcar_sound-gen1" if generation1
+- compatible                    : "renesas,rcar_sound-<soctype>", fallbacks
+                                  "renesas,rcar_sound-gen1" if generation1, and
                                   "renesas,rcar_sound-gen2" if generation2
+                                  Examples with soctypes are:
+                                    - "renesas,rcar_sound-r8a7790" (R-Car H2)
+                                    - "renesas,rcar_sound-r8a7791" (R-Car M2-W)
 - reg                           : Should contain the register physical address.
                                   required register is
                                    SRU/ADG/SSI      if generation1
@@ -35,9 +39,9 @@ DAI subnode properties:
 
 Example:
 
-rcar_sound: rcar_sound@0xffd90000 {
+rcar_sound: rcar_sound@ec500000 {
         #sound-dai-cells = <1>;
-        compatible = "renesas,rcar_sound-gen2";
+        compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2";
         reg =   <0 0xec500000 0 0x1000>, /* SCU */
                 <0 0xec5a0000 0 0x100>,  /* ADG */
                 <0 0xec540000 0 0x1000>, /* SSIU */
diff --git a/Documentation/devicetree/bindings/sound/rt5631.txt b/Documentation/devicetree/bindings/sound/rt5631.txt
new file mode 100644
index 000000000000..92b986ca337b
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rt5631.txt
@@ -0,0 +1,48 @@
+ALC5631/RT5631 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+  - compatible : "realtek,alc5631" or "realtek,rt5631"
+
+  - reg : the I2C address of the device.
+
+Pins on the device (for linking into audio routes):
+
+  * SPK_OUT_R_P
+  * SPK_OUT_R_N
+  * SPK_OUT_L_P
+  * SPK_OUT_L_N
+  * HP_OUT_L
+  * HP_OUT_R
+  * AUX_OUT2_LP
+  * AUX_OUT2_RN
+  * AUX_OUT1_LP
+  * AUX_OUT1_RN
+  * AUX_IN_L_JD
+  * AUX_IN_R_JD
+  * MONO_IN_P
+  * MONO_IN_N
+  * MIC1_P
+  * MIC1_N
+  * MIC2_P
+  * MIC2_N
+  * MONO_OUT_P
+  * MONO_OUT_N
+  * MICBIAS1
+  * MICBIAS2
+
+Example:
+
+alc5631: alc5631@1a {
+        compatible = "realtek,alc5631";
+        reg = <0x1a>;
+};
+
+or
+
+rt5631: rt5631@1a {
+        compatible = "realtek,rt5631";
+        reg = <0x1a>;
+};
diff --git a/Documentation/devicetree/bindings/sound/rt5677.txt b/Documentation/devicetree/bindings/sound/rt5677.txt
index 0701b834fc73..740ff771aa8b 100644
--- a/Documentation/devicetree/bindings/sound/rt5677.txt
+++ b/Documentation/devicetree/bindings/sound/rt5677.txt
@@ -27,6 +27,21 @@ Optional properties:
   Boolean. Indicate MIC1/2 input and LOUT1/2/3 outputs are differential,
   rather than single-ended.
 
+- realtek,gpio-config
+  Array of six 8bit elements that configures GPIO.
+    0 - floating (reset value)
+    1 - pull down
+    2 - pull up
+
+- realtek,jd1-gpio
+  Configures GPIO Mic Jack detection 1.
+  Select 0 ~ 3 as OFF, GPIO1, GPIO2 and GPIO3 respectively.
+
+- realtek,jd2-gpio
+- realtek,jd3-gpio
+  Configures GPIO Mic Jack detection 2 and 3.
+  Select 0 ~ 3 as OFF, GPIO4, GPIO5 and GPIO6 respectively.
+
 Pins on the device (for linking into audio routes):
 
   * IN1P
@@ -56,4 +71,6 @@ rt5677 {
         realtek,pow-ldo2-gpio =
                 <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
         realtek,in1-differential = "true";
+        realtek,gpio-config = /bits/ 8  <0 0 0 0 0 2>;   /* pull up GPIO6 */
+        realtek,jd2-gpio = <3>;  /* Enables Jack detection for GPIO6 */
 };
diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
index 7386d444ada1..d188296bb6ec 100644
--- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
@@ -6,10 +6,17 @@ Required SoC Specific Properties:
    - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S.
    - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with
      secondary fifo, s/w reset control and internal mux for root clk src.
-   - samsung,exynos5420-i2s: for 8/16/24bit multichannel(7.1) I2S with
-     secondary fifo, s/w reset control, internal mux for root clk src and
-     TDM support. TDM (Time division multiplexing) is to allow transfer of
-     multiple channel audio data on single data line.
+   - samsung,exynos5420-i2s: for 8/16/24bit multichannel(5.1) I2S for
+     playback, sterio channel capture, secondary fifo using internal
+     or external dma, s/w reset control, internal mux for root clk src
+     and 7.1 channel TDM support for playback. TDM (Time division multiplexing)
+     is to allow transfer of multiple channel audio data on single data line.
+   - samsung,exynos7-i2s: with all the available features of exynos5 i2s,
+     exynos7 I2S has 7.1 channel TDM support for capture, secondary fifo
+     with only external dma and more no.of root clk sampling frequencies.
+   - samsung,exynos7-i2s1: I2S1 on previous samsung platforms supports
+     stereo channels. exynos7 i2s1 upgraded to 5.1 multichannel with
+     slightly modified bit offsets.
 
 - reg: physical base address of the controller and length of memory mapped
   region.
diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt
index d556dcb8816b..0e5e4eb3ef1b 100644
--- a/Documentation/devicetree/bindings/sound/sgtl5000.txt
+++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt
@@ -7,6 +7,17 @@ Required properties:
 
 - clocks : the clock provider of SYS_MCLK
 
+- micbias-resistor-k-ohms : the bias resistor to be used in kOmhs
+        The resistor can take values of 2k, 4k or 8k.
+        If set to 0 it will be off.
+        If this node is not mentioned or if the value is unknown, then
+        micbias resistor is set to 4K.
+
+- micbias-voltage-m-volts : the bias voltage to be used in mVolts
+        The voltage can take values from 1.25V to 3V by 250mV steps
+        If this node is not mentionned or the value is unknown, then
+        the value is set to 1.25V.
+
 - VDDA-supply : the regulator provider of VDDA
 
 - VDDIO-supply: the regulator provider of VDDIO
@@ -21,6 +32,8 @@ codec: sgtl5000@0a {
         compatible = "fsl,sgtl5000";
         reg = <0x0a>;
         clocks = <&clks 150>;
+        micbias-resistor-k-ohms = <2>;
+        micbias-voltage-m-volts = <2250>;
         VDDA-supply = <&reg_3p3v>;
         VDDIO-supply = <&reg_3p3v>;
 };
diff --git a/Documentation/devicetree/bindings/sound/ts3a227e.txt b/Documentation/devicetree/bindings/sound/ts3a227e.txt
new file mode 100644
index 000000000000..e8bf23eb1803
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/ts3a227e.txt
@@ -0,0 +1,26 @@
+Texas Instruments TS3A227E
+Autonomous Audio Accessory Detection and Configuration Switch
+
+The TS3A227E detect headsets of 3-ring and 4-ring standards and
+switches automatically to route the microphone correctly.  It also
+handles key press detection in accordance with the Android audio
+headset specification v1.0.
+
+Required properties:
+
+ - compatible:          Should contain "ti,ts3a227e".
+ - reg:                 The i2c address. Should contain <0x3b>.
+ - interrupt-parent:    The parent interrupt controller
+ - interrupts:          Interrupt number for /INT pin from the 227e
+
+
+Examples:
+
+        i2c {
+                ts3a227e@3b {
+                        compatible = "ti,ts3a227e";
+                        reg = <0x3b>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/sound/wm8960.txt b/Documentation/devicetree/bindings/sound/wm8960.txt
new file mode 100644
index 000000000000..2deb8a3da9c5
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/wm8960.txt
@@ -0,0 +1,31 @@
+WM8960 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+  - compatible : "wlf,wm8960"
+
+  - reg : the I2C address of the device.
+
+Optional properties:
+  - wlf,shared-lrclk: This is a boolean property. If present, the LRCM bit of
+        R24 (Additional control 2) gets set, indicating that ADCLRC and DACLRC pins
+        will be disabled only when ADC (Left and Right) and DAC (Left and Right)
+        are disabled.
+        When wm8960 works on synchronize mode and DACLRC pin is used to supply
+        frame clock, it will no frame clock for captrue unless enable DAC to enable
+        DACLRC pin. If shared-lrclk is present, no need to enable DAC for captrue.
+
+  - wlf,capless: This is a boolean property. If present, OUT3 pin will be
+        enabled and disabled together with HP_L and HP_R pins in response to jack
+        detect events.
+
+Example:
+
+codec: wm8960@1a {
+        compatible = "wlf,wm8960";
+        reg = <0x1a>;
+
+        wlf,shared-lrclk;
+};
diff --git a/Documentation/devicetree/bindings/spi/spi-gpio.txt b/Documentation/devicetree/bindings/spi/spi-gpio.txt
index 8a824be15754..a95603bcf6ff 100644
--- a/Documentation/devicetree/bindings/spi/spi-gpio.txt
+++ b/Documentation/devicetree/bindings/spi/spi-gpio.txt
@@ -8,8 +8,10 @@ Required properties:
  - gpio-sck: GPIO spec for the SCK line to use
  - gpio-miso: GPIO spec for the MISO line to use
  - gpio-mosi: GPIO spec for the MOSI line to use
- - cs-gpios: GPIOs to use for chipselect lines
- - num-chipselects: number of chipselect lines
+ - cs-gpios: GPIOs to use for chipselect lines.
+             Not needed if num-chipselects = <0>.
+ - num-chipselects: Number of chipselect lines. Should be <0> if a single device
+                    with no chip select is connected.
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/spi/spi-img-spfi.txt b/Documentation/devicetree/bindings/spi/spi-img-spfi.txt
new file mode 100644
index 000000000000..c7dd50fb8eb2
--- /dev/null
+++ b/Documentation/devicetree/bindings/spi/spi-img-spfi.txt
@@ -0,0 +1,37 @@
+IMG Synchronous Peripheral Flash Interface (SPFI) controller
+
+Required properties:
+- compatible: Must be "img,spfi".
+- reg: Must contain the base address and length of the SPFI registers.
+- interrupts: Must contain the SPFI interrupt.
+- clocks: Must contain an entry for each entry in clock-names.
+  See ../clock/clock-bindings.txt for details.
+- clock-names: Must include the following entries:
+  - spfi: SPI operating clock
+  - sys: SPI system interface clock
+- dmas: Must contain an entry for each entry in dma-names.
+  See ../dma/dma.txt for details.
+- dma-names: Must include the following entries:
+  - rx
+  - tx
+- #address-cells: Must be 1.
+- #size-cells: Must be 0.
+
+Optional properties:
+- img,supports-quad-mode: Should be set if the interface supports quad mode
+  SPI transfers.
+
+Example:
+
+spi@18100f00 {
+        compatible = "img,spfi";
+        reg = <0x18100f00 0x100>;
+        interrupts = <GIC_SHARED 22 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&spi_clk>, <&system_clk>;
+        clock-names = "spfi", "sys";
+        dmas = <&mdc 9 0xffffffff 0>, <&mdc 10 0xffffffff 0>;
+        dma-names = "rx", "tx";
+
+        #address-cells = <1>;
+        #size-cells = <0>;
+};
diff --git a/Documentation/devicetree/bindings/spi/spi-meson.txt b/Documentation/devicetree/bindings/spi/spi-meson.txt
new file mode 100644
index 000000000000..bb52a86f3365
--- /dev/null
+++ b/Documentation/devicetree/bindings/spi/spi-meson.txt
@@ -0,0 +1,22 @@
+Amlogic Meson SPI controllers
+
+* SPIFC (SPI Flash Controller)
+
+The Meson SPIFC is a controller optimized for communication with SPI
+NOR memories, without DMA support and a 64-byte unified transmit /
+receive buffer.
+
+Required properties:
+ - compatible: should be "amlogic,meson6-spifc"
+ - reg: physical base address and length of the controller registers
+ - clocks: phandle of the input clock for the baud rate generator
+ - #address-cells: should be 1
+ - #size-cells: should be 0
+
+        spi@c1108c80 {
+                compatible = "amlogic,meson6-spifc";
+                reg = <0xc1108c80 0x80>;
+                clocks = <&clk81>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
diff --git a/Documentation/devicetree/bindings/spi/spi-samsung.txt b/Documentation/devicetree/bindings/spi/spi-samsung.txt
index 1e8a8578148f..6dbdeb3c361a 100644
--- a/Documentation/devicetree/bindings/spi/spi-samsung.txt
+++ b/Documentation/devicetree/bindings/spi/spi-samsung.txt
@@ -9,7 +9,7 @@ Required SoC Specific Properties:
     - samsung,s3c2443-spi: for s3c2443, s3c2416 and s3c2450 platforms
     - samsung,s3c6410-spi: for s3c6410 platforms
     - samsung,s5pv210-spi: for s5pv210 and s5pc110 platforms
-    - samsung,exynos4210-spi: for exynos4 and exynos5 platforms
+    - samsung,exynos7-spi: for exynos7 platforms
 
 - reg: physical base address of the controller and length of memory mapped
   region.
diff --git a/Documentation/devicetree/bindings/thermal/armada-thermal.txt b/Documentation/devicetree/bindings/thermal/armada-thermal.txt
index 4cf024929a3f..4698e0edc205 100644
--- a/Documentation/devicetree/bindings/thermal/armada-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/armada-thermal.txt
@@ -5,17 +5,9 @@ Required properties:
 - compatible:   Should be set to one of the following:
                 marvell,armada370-thermal
                 marvell,armada375-thermal
-                marvell,armada375-z1-thermal
                 marvell,armada380-thermal
                 marvell,armadaxp-thermal
 
-                Note: As the name suggests, "marvell,armada375-z1-thermal"
-                applies for the SoC Z1 stepping only. On such stepping
-                some quirks need to be done and the register offset differs
-                from the one in the A0 stepping.
-                The operating system may auto-detect the SoC stepping and
-                update the compatible and register offsets at runtime.
-
 - reg:          Device's register space.
                 Two entries are expected, see the examples below.
                 The first one is required for the sensor register;
diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt b/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt
new file mode 100644
index 000000000000..ef802de4957a
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt
@@ -0,0 +1,68 @@
+* Temperature Sensor ADC (TSADC) on rockchip SoCs
+
+Required properties:
+- compatible : "rockchip,rk3288-tsadc"
+- reg : physical base address of the controller and length of memory mapped
+        region.
+- interrupts : The interrupt number to the cpu. The interrupt specifier format
+               depends on the interrupt controller.
+- clocks : Must contain an entry for each entry in clock-names.
+- clock-names : Shall be "tsadc" for the converter-clock, and "apb_pclk" for
+                the peripheral clock.
+- resets : Must contain an entry for each entry in reset-names.
+           See ../reset/reset.txt for details.
+- reset-names : Must include the name "tsadc-apb".
+- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.
+- rockchip,hw-tshut-temp : The hardware-controlled shutdown temperature value.
+- rockchip,hw-tshut-mode : The hardware-controlled shutdown mode 0:CRU 1:GPIO.
+- rockchip,hw-tshut-polarity : The hardware-controlled active polarity 0:LOW
+                               1:HIGH.
+
+Exiample:
+tsadc: tsadc@ff280000 {
+        compatible = "rockchip,rk3288-tsadc";
+        reg = <0xff280000 0x100>;
+        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
+        clock-names = "tsadc", "apb_pclk";
+        resets = <&cru SRST_TSADC>;
+        reset-names = "tsadc-apb";
+        pinctrl-names = "default";
+        pinctrl-0 = <&otp_out>;
+        #thermal-sensor-cells = <1>;
+        rockchip,hw-tshut-temp = <95000>;
+        rockchip,hw-tshut-mode = <0>;
+        rockchip,hw-tshut-polarity = <0>;
+};
+
+Example: referring to thermal sensors:
+thermal-zones {
+        cpu_thermal: cpu_thermal {
+                polling-delay-passive = <1000>; /* milliseconds */
+                polling-delay = <5000>; /* milliseconds */
+
+                /* sensor       ID */
+                thermal-sensors = <&tsadc       1>;
+
+                trips {
+                        cpu_alert0: cpu_alert {
+                                temperature = <70000>; /* millicelsius */
+                                hysteresis = <2000>; /* millicelsius */
+                                type = "passive";
+                        };
+                        cpu_crit: cpu_crit {
+                                temperature = <90000>; /* millicelsius */
+                                hysteresis = <2000>; /* millicelsius */
+                                type = "critical";
+                        };
+                };
+
+                cooling-maps {
+                        map0 {
+                                trip = <&cpu_alert0>;
+                                cooling-device =
+                                    <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                        };
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/thermal/tegra-soctherm.txt b/Documentation/devicetree/bindings/thermal/tegra-soctherm.txt
new file mode 100644
index 000000000000..ecf3ed76cd46
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/tegra-soctherm.txt
@@ -0,0 +1,53 @@
+Tegra124 SOCTHERM thermal management system
+
+The SOCTHERM IP block contains thermal sensors, support for polled
+or interrupt-based thermal monitoring, CPU and GPU throttling based
+on temperature trip points, and handling external overcurrent
+notifications. It is also used to manage emergency shutdown in an
+overheating situation.
+
+Required properties :
+- compatible : "nvidia,tegra124-soctherm".
+- reg : Should contain 1 entry:
+  - SOCTHERM register set
+- interrupts : Defines the interrupt used by SOCTHERM
+- clocks : Must contain an entry for each entry in clock-names.
+  See ../clocks/clock-bindings.txt for details.
+- clock-names : Must include the following entries:
+  - tsensor
+  - soctherm
+- resets : Must contain an entry for each entry in reset-names.
+  See ../reset/reset.txt for details.
+- reset-names : Must include the following entries:
+  - soctherm
+- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description
+    of this property. See <dt-bindings/thermal/tegra124-soctherm.h> for a
+    list of valid values when referring to thermal sensors.
+
+
+Example :
+
+        soctherm@0,700e2000 {
+                compatible = "nvidia,tegra124-soctherm";
+                reg = <0x0 0x700e2000 0x0 0x1000>;
+                interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&tegra_car TEGRA124_CLK_TSENSOR>,
+                        <&tegra_car TEGRA124_CLK_SOC_THERM>;
+                clock-names = "tsensor", "soctherm";
+                resets = <&tegra_car 78>;
+                reset-names = "soctherm";
+
+                #thermal-sensor-cells = <1>;
+        };
+
+Example: referring to thermal sensors :
+
+       thermal-zones {
+                cpu {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <1000>;
+
+                        thermal-sensors =
+                                <&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
index f455182b1086..e9c78ce880e6 100644
--- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
+++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
@@ -2,8 +2,10 @@ Marvell Armada 370 and Armada XP Timers
 ---------------------------------------
 
 Required properties:
-- compatible: Should be either "marvell,armada-370-timer" or
-  "marvell,armada-xp-timer" as appropriate.
+- compatible: Should be one of the following
+              "marvell,armada-370-timer",
+              "marvell,armada-375-timer",
+              "marvell,armada-xp-timer".
 - interrupts: Should contain the list of Global Timer interrupts and
   then local timer interrupts
 - reg: Should contain location and length for timers register. First
@@ -13,7 +15,8 @@ Required properties:
 Clocks required for compatible = "marvell,armada-370-timer":
 - clocks : Must contain a single entry describing the clock input
 
-Clocks required for compatible = "marvell,armada-xp-timer":
+Clocks required for compatibles = "marvell,armada-xp-timer",
+                                  "marvell,armada-375-timer":
 - clocks : Must contain an entry for each entry in clock-names.
 - clock-names : Must include the following entries:
   "nbclk" (L2/coherency fabric clock),
diff --git a/Documentation/devicetree/bindings/timer/renesas,mtu2.txt b/Documentation/devicetree/bindings/timer/renesas,mtu2.txt
index d9a8d5af1a21..ba0a34d97eb8 100644
--- a/Documentation/devicetree/bindings/timer/renesas,mtu2.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,mtu2.txt
@@ -1,4 +1,4 @@
-* Renesas R-Car Multi-Function Timer Pulse Unit 2 (MTU2)
+* Renesas Multi-Function Timer Pulse Unit 2 (MTU2)
 
 The MTU2 is a multi-purpose, multi-channel timer/counter with configurable
 clock inputs and programmable compare match.
diff --git a/Documentation/devicetree/bindings/timer/renesas,tmu.txt b/Documentation/devicetree/bindings/timer/renesas,tmu.txt
index 7db89fb25444..cd5f20bf2582 100644
--- a/Documentation/devicetree/bindings/timer/renesas,tmu.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,tmu.txt
@@ -1,4 +1,4 @@
-* Renesas R-Car Timer Unit (TMU)
+* Renesas R-Mobile/R-Car Timer Unit (TMU)
 
 The TMU is a 32-bit timer/counter with configurable clock inputs and
 programmable compare match.
@@ -9,6 +9,8 @@ are independent. The TMU hardware supports up to three channels.
 Required Properties:
 
   - compatible: must contain one or more of the following:
+    - "renesas,tmu-r8a7740" for the r8a7740 TMU
+    - "renesas,tmu-r8a7778" for the r8a7778 TMU
     - "renesas,tmu-r8a7779" for the r8a7779 TMU
     - "renesas,tmu" for any TMU.
       This is a fallback for the above renesas,tmu-* entries
diff --git a/Documentation/devicetree/bindings/unittest.txt b/Documentation/devicetree/bindings/unittest.txt
new file mode 100644
index 000000000000..0f92a22fddfa
--- /dev/null
+++ b/Documentation/devicetree/bindings/unittest.txt
@@ -0,0 +1,14 @@
+* OF selftest platform device
+
+** selftest
+
+Required properties:
+- compatible: must be "selftest"
+
+All other properties are optional.
+
+Example:
+        selftest {
+                compatible = "selftest";
+                status = "okay";
+        };
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
new file mode 100644
index 000000000000..27f8b1e5ee46
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
@@ -0,0 +1,24 @@
+* USB2 ChipIdea USB controller for ci13xxx
+
+Required properties:
+- compatible: should be "chipidea,usb2"
+- reg: base address and length of the registers
+- interrupts: interrupt for the USB controller
+
+Optional properties:
+- clocks: reference to the USB clock
+- phys: reference to the USB PHY
+- phy-names: should be "usb-phy"
+- vbus-supply: reference to the VBUS regulator
+
+Example:
+
+        usb@f7ed0000 {
+                compatible = "chipidea,usb2";
+                reg = <0xf7ed0000 0x10000>;
+                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&chip CLKID_USB0>;
+                phys = <&usb_phy0>;
+                phy-names = "usb-phy";
+                vbus-supply = <&reg_usb0_vbus>;
+        };
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index 471366d6a129..cd7f0454e13a 100644
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -14,6 +14,29 @@ Optional properties:
  - phys: from the *Generic PHY* bindings
  - phy-names: from the *Generic PHY* bindings
  - tx-fifo-resize: determines if the FIFO *has* to be reallocated.
+ - snps,disable_scramble_quirk: true when SW should disable data scrambling.
+        Only really useful for FPGA builds.
+ - snps,has-lpm-erratum: true when DWC3 was configured with LPM Erratum enabled
+ - snps,lpm-nyet-threshold: LPM NYET threshold
+ - snps,u2exit_lfps_quirk: set if we want to enable u2exit lfps quirk
+ - snps,u2ss_inp3_quirk: set if we enable P3 OK for U2/SS Inactive quirk
+ - snps,req_p1p2p3_quirk: when set, the core will always request for
+                        P1/P2/P3 transition sequence.
+ - snps,del_p1p2p3_quirk: when set core will delay P1/P2/P3 until a certain
+                        amount of 8B10B errors occur.
+ - snps,del_phy_power_chg_quirk: when set core will delay PHY power change
+                        from P0 to P1/P2/P3.
+ - snps,lfps_filter_quirk: when set core will filter LFPS reception.
+ - snps,rx_detect_poll_quirk: when set core will disable a 400us delay to start
+                        Polling LFPS after RX.Detect.
+ - snps,tx_de_emphasis_quirk: when set core will set Tx de-emphasis value.
+ - snps,tx_de_emphasis: the value driven to the PHY is controlled by the
+                        LTSSM during USB3 Compliance mode.
+ - snps,dis_u3_susphy_quirk: when set core will disable USB3 suspend phy.
+ - snps,dis_u2_susphy_quirk: when set core will disable USB2 suspend phy.
+ - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
+                        utmi_l1_suspend_n, false when asserts utmi_sleep_n
+ - snps,hird-threshold: HIRD threshold
 
 This is usually a subnode to DWC3 glue to which it is connected.
 
diff --git a/Documentation/devicetree/bindings/usb/exynos-usb.txt b/Documentation/devicetree/bindings/usb/exynos-usb.txt
index a3b5990d0f2c..9b4dbe3b2acc 100644
--- a/Documentation/devicetree/bindings/usb/exynos-usb.txt
+++ b/Documentation/devicetree/bindings/usb/exynos-usb.txt
@@ -82,8 +82,10 @@ Example:
 
 DWC3
 Required properties:
- - compatible: should be "samsung,exynos5250-dwusb3" for USB 3.0 DWC3
-               controller.
+ - compatible: should be one of the following -
+               "samsung,exynos5250-dwusb3": for USB 3.0 DWC3 controller on
+                                            Exynos5250/5420.
+               "samsung,exynos7-dwusb3": for USB 3.0 DWC3 controller on Exynos7.
  - #address-cells, #size-cells : should be '1' if the device has sub-nodes
                                  with 'reg' property.
  - ranges: allows valid 1:1 translation between child's address space and
diff --git a/Documentation/devicetree/bindings/usb/pxa-usb.txt b/Documentation/devicetree/bindings/usb/pxa-usb.txt
index 79729a948d5a..9c331799b87c 100644
--- a/Documentation/devicetree/bindings/usb/pxa-usb.txt
+++ b/Documentation/devicetree/bindings/usb/pxa-usb.txt
@@ -29,3 +29,25 @@ Example:
                 marvell,port-mode = <2>; /* PMM_GLOBAL_MODE */
         };
 
+UDC
+
+Required properties:
+ - compatible: Should be "marvell,pxa270-udc" for USB controllers
+   used in device mode.
+ - reg: usb device MMIO address space
+ - interrupts: single interrupt generated by the UDC IP
+ - clocks: input clock of the UDC IP (see clock-bindings.txt)
+
+Optional properties:
+ - gpios:
+   - gpio activated to control the USB D+ pullup (see gpio.txt)
+
+Example:
+
+                pxa27x_udc: udc@40600000 {
+                        compatible = "marvell,pxa270-udc";
+                        reg = <0x40600000 0x10000>;
+                        interrupts = <11>;
+                        clocks = <&pxa2xx_clks 11>;
+                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+                };
diff --git a/Documentation/devicetree/bindings/usb/usb-ohci.txt b/Documentation/devicetree/bindings/usb/usb-ohci.txt
index b968a1aea995..19233b7365e1 100644
--- a/Documentation/devicetree/bindings/usb/usb-ohci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-ohci.txt
@@ -9,6 +9,8 @@ Optional properties:
 - big-endian-regs : boolean, set this for hcds with big-endian registers
 - big-endian-desc : boolean, set this for hcds with big-endian descriptors
 - big-endian : boolean, for hcds with big-endian-regs + big-endian-desc
+- no-big-frame-no : boolean, set if frame_no lives in bits [15:0] of HCCA
+- num-ports : u32, to override the detected port count
 - clocks : a list of phandle + clock specifier pairs
 - phys : phandle + phy specifier pair
 - phy-names : "usb"
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 723999d73744..b1df0ad1306c 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -34,17 +34,20 @@ chipidea	Chipidea, Inc
 chrp    Common Hardware Reference Platform
 chunghwa        Chunghwa Picture Tubes Ltd.
 cirrus  Cirrus Logic, Inc.
+cnm     Chips&Media, Inc.
 cortina Cortina Systems, Inc.
 crystalfontz    Crystalfontz America, Inc.
 dallas  Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom DAVICOM Semiconductor, Inc.
 denx    Denx Software Engineering
 digi    Digi International Inc.
+digilent        Diglent, Inc.
 dlg     Dialog Semiconductor
 dlink   D-Link Corporation
 dmo     Data Modul AG
 ebv     EBV Elektronik
 edt     Emerging Display Technologies
+elan    Elan Microelectronic Corp.
 emmicro EM Microelectronic
 energymicro     Silicon Laboratories (formerly Energy Micro AS)
 epcos   EPCOS AG
@@ -64,8 +67,10 @@ gmt	Global Mixed-mode Technology, Inc.
 google  Google, Inc.
 gumstix Gumstix, Inc.
 gw      Gateworks Corporation
+hannstar        HannStar Display Corporation
 haoyu   Haoyu Microelectronic Co. Ltd.
 hisilicon       Hisilicon Limited.
+hit     Hitachi Ltd.
 honeywell       Honeywell
 hp      Hewlett Packard
 i2se    I2SE GmbH
@@ -77,6 +82,7 @@ innolux	Innolux Corporation
 intel   Intel Corporation
 intercontrol    Inter Control Group
 isee    ISEE 2007 S.L.
+isil    Intersil (deprecated, use isl)
 isl     Intersil
 karo    Ka-Ro electronics GmbH
 keymile Keymile GmbH
@@ -90,12 +96,15 @@ lltc	Linear Technology Corporation
 marvell Marvell Technology Group Ltd.
 maxim   Maxim Integrated Products
 mediatek        MediaTek Inc.
+merrii  Merrii Technology Co., Ltd.
 micrel  Micrel Inc.
 microchip       Microchip Technology Inc.
+micron  Micron Technology Inc.
 mitsubishi      Mitsubishi Electric Corporation
 mosaixtech      Mosaix Technologies, Inc.
 moxa    Moxa
 mpl     MPL AG
+mti     Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader     Mundo Reader S.L.
 murata  Murata Manufacturing Co., Ltd.
 mxicy   Macronix International Co., Ltd.
@@ -110,6 +119,7 @@ nxp	NXP Semiconductors
 onnn    ON Semiconductor Corp.
 opencores       OpenCores.org
 panasonic       Panasonic Corporation
+pericom Pericom Technology Inc.
 phytec  PHYTEC Messtechnik GmbH
 picochip        Picochip Ltd
 plathome        Plat'Home Co., Ltd.
@@ -127,6 +137,7 @@ renesas	Renesas Electronics Corporation
 ricoh   Ricoh Co. Ltd.
 rockchip        Fuzhou Rockchip Electronics Co., Ltd
 samsung Samsung Semiconductor
+sandisk Sandisk Corporation
 sbs     Smart Battery System
 schindler       Schindler
 seagate Seagate Technology PLC
@@ -138,7 +149,7 @@ silergy	Silergy Corp.
 sirf    SiRF Technology, Inc.
 sitronix        Sitronix Technology Corporation
 smsc    Standard Microsystems Corporation
-snps    Synopsys, Inc.
+snps    Synopsys, Inc.
 solidrun        SolidRun
 sony    Sony Corporation
 spansion        Spansion Inc.
@@ -146,6 +157,7 @@ st	STMicroelectronics
 ste     ST-Ericsson
 stericsson      ST-Ericsson
 synology        Synology, Inc.
+tbs     TBS Technologies
 thine   THine Electronics, Inc.
 ti      Texas Instruments
 tlm     Trusted Logic Mobility
diff --git a/Documentation/devicetree/bindings/video/adi,adv7511.txt b/Documentation/devicetree/bindings/video/adi,adv7511.txt
new file mode 100644
index 000000000000..96c25ee01501
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/adi,adv7511.txt
@@ -0,0 +1,88 @@
+Analog Device ADV7511(W)/13 HDMI Encoders
+-----------------------------------------
+
+The ADV7511, ADV7511W and ADV7513 are HDMI audio and video transmitters
+compatible with HDMI 1.4 and DVI 1.0. They support color space conversion,
+S/PDIF, CEC and HDCP.
+
+Required properties:
+
+- compatible: Should be one of "adi,adv7511", "adi,adv7511w" or "adi,adv7513"
+- reg: I2C slave address
+
+The ADV7511 supports a large number of input data formats that differ by their
+color depth, color format, clock mode, bit justification and random
+arrangement of components on the data bus. The combination of the following
+properties describe the input and map directly to the video input tables of the
+ADV7511 datasheet that document all the supported combinations.
+
+- adi,input-depth: Number of bits per color component at the input (8, 10 or
+  12).
+- adi,input-colorspace: The input color space, one of "rgb", "yuv422" or
+  "yuv444".
+- adi,input-clock: The input clock type, one of "1x" (one clock cycle per
+  pixel), "2x" (two clock cycles per pixel), "ddr" (one clock cycle per pixel,
+  data driven on both edges).
+
+The following input format properties are required except in "rgb 1x" and
+"yuv444 1x" modes, in which case they must not be specified.
+
+- adi,input-style: The input components arrangement variant (1, 2 or 3), as
+  listed in the input format tables in the datasheet.
+- adi,input-justification: The input bit justification ("left", "evenly",
+  "right").
+
+Optional properties:
+
+- interrupts: Specifier for the ADV7511 interrupt
+- pd-gpios: Specifier for the GPIO connected to the power down signal
+
+- adi,clock-delay: Video data clock delay relative to the pixel clock, in ps
+  (-1200 ps .. 1600 ps). Defaults to no delay.
+- adi,embedded-sync: The input uses synchronization signals embedded in the
+  data stream (similar to BT.656). Defaults to separate H/V synchronization
+  signals.
+
+Required nodes:
+
+The ADV7511 has two video ports. Their connections are modelled using the OF
+graph bindings specified in Documentation/devicetree/bindings/graph.txt.
+
+- Video port 0 for the RGB or YUV input
+- Video port 1 for the HDMI output
+
+
+Example
+-------
+
+        adv7511w: hdmi@39 {
+                compatible = "adi,adv7511w";
+                reg = <39>;
+                interrupt-parent = <&gpio3>;
+                interrupts = <29 IRQ_TYPE_EDGE_FALLING>;
+
+                adi,input-depth = <8>;
+                adi,input-colorspace = "rgb";
+                adi,input-clock = "1x";
+                adi,input-style = <1>;
+                adi,input-justification = "evenly";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                adv7511w_in: endpoint {
+                                        remote-endpoint = <&dpi_out>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+                                adv7511_out: endpoint {
+                                        remote-endpoint = <&hdmi_connector_in>;
+                                };
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/video/backlight/lp855x.txt b/Documentation/devicetree/bindings/video/backlight/lp855x.txt
index 96e83a56048e..0a3ecbc3a1b9 100644
--- a/Documentation/devicetree/bindings/video/backlight/lp855x.txt
+++ b/Documentation/devicetree/bindings/video/backlight/lp855x.txt
@@ -12,6 +12,7 @@ Optional properties:
   - pwm-period: PWM period value. Set only PWM input mode used (u32)
   - rom-addr: Register address of ROM area to be updated (u8)
   - rom-val: Register value to be updated (u8)
+  - power-supply: Regulator which controls the 3V rail
 
 Example:
 
@@ -56,6 +57,7 @@ Example:
         backlight@2c {
                 compatible = "ti,lp8557";
                 reg = <0x2c>;
+                power-supply = <&backlight_vdd>;
 
                 dev-ctrl = /bits/ 8 <0x41>;
                 init-brt = /bits/ 8 <0x0a>;
diff --git a/Documentation/devicetree/bindings/video/exynos_dsim.txt b/Documentation/devicetree/bindings/video/exynos_dsim.txt
index e74243b4b317..ca2b4aacd9af 100644
--- a/Documentation/devicetree/bindings/video/exynos_dsim.txt
+++ b/Documentation/devicetree/bindings/video/exynos_dsim.txt
@@ -4,6 +4,7 @@ Required properties:
   - compatible: value should be one of the following
                 "samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 SoCs */
                 "samsung,exynos4210-mipi-dsi" /* for Exynos4 SoCs */
+                "samsung,exynos4415-mipi-dsi" /* for Exynos4415 SoC */
                 "samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */
   - reg: physical base address and length of the registers set for the device
   - interrupts: should contain DSI interrupt
diff --git a/Documentation/devicetree/bindings/video/rockchip-drm.txt b/Documentation/devicetree/bindings/video/rockchip-drm.txt
new file mode 100644
index 000000000000..7fff582495a2
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/rockchip-drm.txt
@@ -0,0 +1,19 @@
+Rockchip DRM master device
+================================
+
+The Rockchip DRM master device is a virtual device needed to list all
+vop devices or other display interface nodes that comprise the
+graphics subsystem.
+
+Required properties:
+- compatible: Should be "rockchip,display-subsystem"
+- ports: Should contain a list of phandles pointing to display interface port
+  of vop devices. vop definitions as defined in
+  Documentation/devicetree/bindings/video/rockchip-vop.txt
+
+example:
+
+display-subsystem {
+        compatible = "rockchip,display-subsystem";
+        ports = <&vopl_out>, <&vopb_out>;
+};
diff --git a/Documentation/devicetree/bindings/video/rockchip-vop.txt b/Documentation/devicetree/bindings/video/rockchip-vop.txt
new file mode 100644
index 000000000000..d15351f2313d
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/rockchip-vop.txt
@@ -0,0 +1,58 @@
+device-tree bindings for rockchip soc display controller (vop)
+
+VOP (Visual Output Processor) is the Display Controller for the Rockchip
+series of SoCs which transfers the image data from a video memory
+buffer to an external LCD interface.
+
+Required properties:
+- compatible: value should be one of the following
+                "rockchip,rk3288-vop";
+
+- interrupts: should contain a list of all VOP IP block interrupts in the
+                 order: VSYNC, LCD_SYSTEM. The interrupt specifier
+                 format depends on the interrupt controller used.
+
+- clocks: must include clock specifiers corresponding to entries in the
+                clock-names property.
+
+- clock-names: Must contain
+                aclk_vop: for ddr buffer transfer.
+                hclk_vop: for ahb bus to R/W the phy regs.
+                dclk_vop: pixel clock.
+
+- resets: Must contain an entry for each entry in reset-names.
+  See ../reset/reset.txt for details.
+- reset-names: Must include the following entries:
+  - axi
+  - ahb
+  - dclk
+
+- iommus: required a iommu node
+
+- port: A port node with endpoint definitions as defined in
+  Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+SoC specific DT entry:
+        vopb: vopb@ff930000 {
+                compatible = "rockchip,rk3288-vop";
+                reg = <0xff930000 0x19c>;
+                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
+                clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+                resets = <&cru SRST_LCDC1_AXI>, <&cru SRST_LCDC1_AHB>, <&cru SRST_LCDC1_DCLK>;
+                reset-names = "axi", "ahb", "dclk";
+                iommus = <&vopb_mmu>;
+                vopb_out: port {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        vopb_out_edp: endpoint@0 {
+                                reg = <0>;
+                                remote-endpoint=<&edp_in_vopb>;
+                        };
+                        vopb_out_hdmi: endpoint@1 {
+                                reg = <1>;
+                                remote-endpoint=<&hdmi_in_vopb>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/video/samsung-fimd.txt b/Documentation/devicetree/bindings/video/samsung-fimd.txt
index 4e6c77c85546..cf1af6371021 100644
--- a/Documentation/devicetree/bindings/video/samsung-fimd.txt
+++ b/Documentation/devicetree/bindings/video/samsung-fimd.txt
@@ -11,6 +11,7 @@ Required properties:
                 "samsung,s5pv210-fimd"; /* for S5PV210 SoC */
                 "samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */
                 "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */
+                "samsung,exynos4415-fimd"; /* for Exynos4415 SoC */
                 "samsung,exynos5250-fimd"; /* for Exynos5 SoCs */
 
 - reg: physical base address and length of the FIMD registers set.
diff --git a/Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt b/Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt
new file mode 100644
index 000000000000..c46ba641a1df
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt
@@ -0,0 +1,33 @@
+Sunxi specific Simple Framebuffer bindings
+
+This binding documents sunxi specific extensions to the simple-framebuffer
+bindings. The sunxi simplefb u-boot code relies on the devicetree containing
+pre-populated simplefb nodes.
+
+These extensions are intended so that u-boot can select the right node based
+on which pipeline is being used. As such they are solely intended for
+firmware / bootloader use, and the OS should ignore them.
+
+Required properties:
+- compatible: "allwinner,simple-framebuffer"
+- allwinner,pipeline, one of:
+  "de_be0-lcd0"
+  "de_be1-lcd1"
+  "de_be0-lcd0-hdmi"
+  "de_be1-lcd1-hdmi"
+
+Example:
+
+chosen {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        ranges;
+
+        framebuffer@0 {
+                compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
+                allwinner,pipeline = "de_be0-lcd0-hdmi";
+                clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
+                         <&ahb_gates 44>;
+                status = "disabled";
+        };
+};
diff --git a/Documentation/devicetree/bindings/video/simple-framebuffer.txt b/Documentation/devicetree/bindings/video/simple-framebuffer.txt
index 70c26f3a5b9a..4474ef6e0b95 100644
--- a/Documentation/devicetree/bindings/video/simple-framebuffer.txt
+++ b/Documentation/devicetree/bindings/video/simple-framebuffer.txt
@@ -1,8 +1,40 @@
 Simple Framebuffer
 
-A simple frame-buffer describes a raw memory region that may be rendered to,
-with the assumption that the display hardware has already been set up to scan
-out from that buffer.
+A simple frame-buffer describes a frame-buffer setup by firmware or
+the bootloader, with the assumption that the display hardware has already
+been set up to scan out from the memory pointed to by the reg property.
+
+Since simplefb nodes represent runtime information they must be sub-nodes of
+the chosen node (*). Simplefb nodes must be named "framebuffer@<address>".
+
+If the devicetree contains nodes for the display hardware used by a simplefb,
+then the simplefb node must contain a property called "display", which
+contains a phandle pointing to the primary display hw node, so that the OS
+knows which simplefb to disable when handing over control to a driver for the
+real hardware. The bindings for the hw nodes must specify which node is
+considered the primary node.
+
+It is advised to add display# aliases to help the OS determine how to number
+things. If display# aliases are used, then if the simplefb node contains a
+"display" property then the /aliases/display# path must point to the display
+hw node the "display" property points to, otherwise it must point directly
+to the simplefb node.
+
+If a simplefb node represents the preferred console for user interaction,
+then the chosen node's stdout-path property should point to it, or to the
+primary display hw node, as with display# aliases. If display aliases are
+used then it should be set to the alias instead.
+
+It is advised that devicetree files contain pre-filled, disabled framebuffer
+nodes, so that the firmware only needs to update the mode information and
+enable them. This way if e.g. later on support for more display clocks get
+added, the simplefb nodes will already contain this info and the firmware
+does not need to be updated.
+
+If pre-filled framebuffer nodes are used, the firmware may need extra
+information to find the right node. In that case an extra platform specific
+compatible and platform specific properties should be used and documented,
+see e.g. simple-framebuffer-sunxi.txt .
 
 Required properties:
 - compatible: "simple-framebuffer"
@@ -14,13 +46,41 @@ Required properties:
   - r5g6b5 (16-bit pixels, d[15:11]=r, d[10:5]=g, d[4:0]=b).
   - a8b8g8r8 (32-bit pixels, d[31:24]=a, d[23:16]=b, d[15:8]=g, d[7:0]=r).
 
+Optional properties:
+- clocks : List of clocks used by the framebuffer. Clocks listed here
+           are expected to already be configured correctly. The OS must
+           ensure these clocks are not modified or disabled while the
+           simple framebuffer remains active.
+- display : phandle pointing to the primary display hardware node
+
 Example:
 
-        framebuffer {
+aliases {
+        display0 = &lcdc0;
+}
+
+chosen {
+        framebuffer0: framebuffer@1d385000 {
                 compatible = "simple-framebuffer";
                 reg = <0x1d385000 (1600 * 1200 * 2)>;
                 width = <1600>;
                 height = <1200>;
                 stride = <(1600 * 2)>;
                 format = "r5g6b5";
+                clocks = <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>;
+                display = <&lcdc0>;
+        };
+        stdout-path = "display0";
+};
+
+soc@01c00000 {
+        lcdc0: lcdc@1c0c000 {
+                compatible = "allwinner,sun4i-a10-lcdc";
+                ...
         };
+};
+
+
+*) Older devicetree files may have a compatible = "simple-framebuffer" node
+in a different place, operating systems must first enumerate any compatible
+nodes found under chosen and then check for other compatible nodes.
diff --git a/Documentation/devicetree/bindings/w1/omap-hdq.txt b/Documentation/devicetree/bindings/w1/omap-hdq.txt
new file mode 100644
index 000000000000..fef794741bd1
--- /dev/null
+++ b/Documentation/devicetree/bindings/w1/omap-hdq.txt
@@ -0,0 +1,17 @@
+* OMAP HDQ One wire bus master controller
+
+Required properties:
+- compatible : should be "ti,omap3-1w"
+- reg : Address and length of the register set for the device
+- interrupts : interrupt line.
+- ti,hwmods : "hdq1w"
+
+Example:
+
+- From omap3.dtsi
+  hdqw1w: 1w@480b2000 {
+        compatible = "ti,omap3-1w";
+        reg = <0x480b2000 0x1000>;
+        interrupts = <58>;
+        ti,hwmods = "hdq1w";
+  };
diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt b/Documentation/devicetree/bindings/watchdog/marvel.txt
index 97223fddb7bd..858ed9221ac4 100644
--- a/Documentation/devicetree/bindings/watchdog/marvel.txt
+++ b/Documentation/devicetree/bindings/watchdog/marvel.txt
@@ -17,6 +17,18 @@ For "marvell,armada-375-wdt" and "marvell,armada-380-wdt":
 - reg           : A third entry is mandatory and should contain the
                   shared mask/unmask RSTOUT address.
 
+Clocks required for compatibles = "marvell,orion-wdt",
+                                  "marvell,armada-370-wdt":
+- clocks : Must contain a single entry describing the clock input
+
+Clocks required for compatibles = "marvell,armada-xp-wdt"
+                                  "marvell,armada-375-wdt"
+                                  "marvell,armada-380-wdt":
+- clocks : Must contain an entry for each entry in clock-names.
+- clock-names : Must include the following entries:
+  "nbclk" (L2/coherency fabric clock),
+  "fixed" (Reference 25 MHz fixed-clock).
+
 Optional properties:
 
 - interrupts    : Contains the IRQ for watchdog expiration
@@ -30,4 +42,5 @@ Example:
                 interrupts = <3>;
                 timeout-sec = <10>;
                 status = "okay";
+                clocks = <&gate_clk 7>;
         };
diff --git a/Documentation/devicetree/of_selftest.txt b/Documentation/devicetree/of_selftest.txt
index 1e3d5c92b5e3..57a808b588bf 100644
--- a/Documentation/devicetree/of_selftest.txt
+++ b/Documentation/devicetree/of_selftest.txt
@@ -63,7 +63,6 @@ struct device_node {
     struct  device_node *parent;
     struct  device_node *child;
     struct  device_node *sibling;
-    struct  device_node *allnext;   /* next in list of all nodes */
     ...
  };
 
@@ -99,12 +98,6 @@ child11 -> sibling12 -> sibling13 -> sibling14 -> null
 Figure 1: Generic structure of un-flattened device tree
 
 
-*allnext: it is used to link all the nodes of DT into a list. So, for the
- above tree the list would be as follows:
-
-root->child1->child11->sibling12->sibling13->child131->sibling14->sibling2->
-child21->sibling22->sibling23->sibling3->child31->sibling32->sibling4->null
-
 Before executing OF selftest, it is required to attach the test data to
 machine's device tree (if present). So, when selftest_data_add() is called,
 at first it reads the flattened device tree data linked into the kernel image
@@ -131,11 +124,6 @@ root ('/')
  test-child01      null             null             null
 
 
-allnext list:
-
-root->testcase-data->test-child0->test-child01->test-sibling1->test-sibling2
-->test-sibling3->null
-
 Figure 2: Example test data tree to be attached to live tree.
 
 According to the scenario above, the live tree is already present so it isn't
@@ -204,8 +192,6 @@ detached and then moving up the parent nodes are removed, and eventually the
 whole tree). selftest_data_remove() calls detach_node_and_children() that uses
 of_detach_node() to detach the nodes from the live device tree.
 
-To detach a node, of_detach_node() first updates all_next linked list, by
-attaching the previous node's allnext to current node's allnext pointer. And
-then, it either updates the child pointer of given node's parent to its
-sibling or attaches the previous sibling to the given node's sibling, as
-appropriate. That is it :)
+To detach a node, of_detach_node() either updates the child pointer of given
+node's parent to its sibling or attaches the previous sibling to the given
+node's sibling, as appropriate. That is it :)
diff --git a/Documentation/devicetree/overlay-notes.txt b/Documentation/devicetree/overlay-notes.txt
new file mode 100644
index 000000000000..30ae758e3eef
--- /dev/null
+++ b/Documentation/devicetree/overlay-notes.txt
@@ -0,0 +1,133 @@
+Device Tree Overlay Notes
+-------------------------
+
+This document describes the implementation of the in-kernel
+device tree overlay functionality residing in drivers/of/overlay.c and is a
+companion document to Documentation/devicetree/dt-object-internal.txt[1] &
+Documentation/devicetree/dynamic-resolution-notes.txt[2]
+
+How overlays work
+-----------------
+
+A Device Tree's overlay purpose is to modify the kernel's live tree, and
+have the modification affecting the state of the the kernel in a way that
+is reflecting the changes.
+Since the kernel mainly deals with devices, any new device node that result
+in an active device should have it created while if the device node is either
+disabled or removed all together, the affected device should be deregistered.
+
+Lets take an example where we have a foo board with the following base tree
+which is taken from [1].
+
+---- foo.dts -----------------------------------------------------------------
+        /* FOO platform */
+        / {
+                compatible = "corp,foo";
+
+                /* shared resources */
+                res: res {
+                };
+
+                /* On chip peripherals */
+                ocp: ocp {
+                        /* peripherals that are always instantiated */
+                        peripheral1 { ... };
+                }
+        };
+---- foo.dts -----------------------------------------------------------------
+
+The overlay bar.dts, when loaded (and resolved as described in [2]) should
+
+---- bar.dts -----------------------------------------------------------------
+/plugin/;       /* allow undefined label references and record them */
+/ {
+        ....    /* various properties for loader use; i.e. part id etc. */
+        fragment@0 {
+                target = <&ocp>;
+                __overlay__ {
+                        /* bar peripheral */
+                        bar {
+                                compatible = "corp,bar";
+                                ... /* various properties and child nodes */
+                        }
+                };
+        };
+};
+---- bar.dts -----------------------------------------------------------------
+
+result in foo+bar.dts
+
+---- foo+bar.dts -------------------------------------------------------------
+        /* FOO platform + bar peripheral */
+        / {
+                compatible = "corp,foo";
+
+                /* shared resources */
+                res: res {
+                };
+
+                /* On chip peripherals */
+                ocp: ocp {
+                        /* peripherals that are always instantiated */
+                        peripheral1 { ... };
+
+                        /* bar peripheral */
+                        bar {
+                                compatible = "corp,bar";
+                                ... /* various properties and child nodes */
+                        }
+                }
+        };
+---- foo+bar.dts -------------------------------------------------------------
+
+As a result of the the overlay, a new device node (bar) has been created
+so a bar platform device will be registered and if a matching device driver
+is loaded the device will be created as expected.
+
+Overlay in-kernel API
+--------------------------------
+
+The API is quite easy to use.
+
+1. Call of_overlay_create() to create and apply an overlay. The return value
+is a cookie identifying this overlay.
+
+2. Call of_overlay_destroy() to remove and cleanup the overlay previously
+created via the call to of_overlay_create(). Removal of an overlay that
+is stacked by another will not be permitted.
+
+Finally, if you need to remove all overlays in one-go, just call
+of_overlay_destroy_all() which will remove every single one in the correct
+order.
+
+Overlay DTS Format
+------------------
+
+The DTS of an overlay should have the following format:
+
+{
+        /* ignored properties by the overlay */
+
+        fragment@0 {    /* first child node */
+
+                target=<phandle>;       /* phandle target of the overlay */
+        or
+                target-path="/path";    /* target path of the overlay */
+
+                __overlay__ {
+                        property-a;     /* add property-a to the target */
+                        node-a {        /* add to an existing, or create a node-a */
+                                ...
+                        };
+                };
+        }
+        fragment@1 {    /* second child node */
+                ...
+        };
+        /* more fragments follow */
+}
+
+Using the non-phandle based target method allows one to use a base DT which does
+not contain a __symbols__ node, i.e. it was not compiled with the -@ option.
+The __symbols__ node is only required for the target=<phandle> method, since it
+contains the information required to map from a phandle to a tree location.
diff --git a/Documentation/devicetree/todo.txt b/Documentation/devicetree/todo.txt
index c3cf0659bd19..b5139d1de811 100644
--- a/Documentation/devicetree/todo.txt
+++ b/Documentation/devicetree/todo.txt
@@ -2,7 +2,6 @@ Todo list for devicetree:
 
 === General structure ===
 - Switch from custom lists to (h)list_head for nodes and properties structure
-- Remove of_allnodes list and iterate using list of child nodes alone
 
 === CONFIG_OF_DYNAMIC ===
 - Switch to RCU for tree updates and get rid of global spinlock