204 files changed, 4835 insertions, 244 deletions
diff --git a/Documentation/devicetree/bindings/arm/armada-38x.txt b/Documentation/devicetree/bindings/arm/armada-38x.txt
index ad9f8ed4d9bd..202953f1887e 100644
--- a/Documentation/devicetree/bindings/arm/armada-38x.txt
+++ b/Documentation/devicetree/bindings/arm/armada-38x.txt
@@ -15,6 +15,13 @@ Required root node property:
 compatible: must contain "marvell,armada385"
+In addition, boards using the Marvell Armada 388 SoC shall have the
+following property before the previous one:
+Required root node property:
+compatible: must contain "marvell,armada388"
 Example:
 compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt
index 562cda9d86d9..ad319f84f560 100644
--- a/Documentation/devicetree/bindings/arm/atmel-at91.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt
@@ -24,6 +24,7 @@ compatible: must be one of:
    o "atmel,at91sam9g45"
    o "atmel,at91sam9n12"
    o "atmel,at91sam9rl"
+    o "atmel,at91sam9xe"
 * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific
   SoC family:
    o "atmel,sama5d3" shall be extended with the specific SoC compatible:
@@ -136,3 +137,19 @@ Example:
                compatible = "atmel,at91sam9260-rstc";
                reg = <0xfffffd00 0x10>;
        };
+Special Function Registers (SFR)
+Special Function Registers (SFR) manage specific aspects of the integrated
+memory, bridge implementations, processor and other functionality not controlled
+elsewhere.
+required properties:
+- compatible: Should be "atmel,<chip>-sfr", "syscon".
+  <chip> can be "sama5d3" or "sama5d4".
+- reg: Should contain registers location and length
+        sfr@f0038000 {
+                compatible = "atmel,sama5d3-sfr", "syscon";
+                reg = <0xf0038000 0x60>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt b/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt
index 3c436cc4f35d..430608ec09f0 100644
--- a/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt
+++ b/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt
@@ -79,7 +79,9 @@ reboot
 Required properties
    - compatible
-        The string property "brcm,brcmstb-reboot".
+        The string property "brcm,brcmstb-reboot" for 40nm/28nm chips with
+        the new SYS_CTRL interface, or "brcm,bcm7038-reboot" for 65nm
+        chips with the old SUN_TOP_CTRL interface.
    - syscon
        A phandle / integer array that points to the syscon node which describes
diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
index d790f49066f3..a3089359aaa6 100644
--- a/Documentation/devicetree/bindings/arm/coresight.txt
+++ b/Documentation/devicetree/bindings/arm/coresight.txt
@@ -38,8 +38,6 @@ its hardware characteristcs.
          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:
@@ -94,8 +92,6 @@ Example:
                 * 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>;
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index b2aacbe16ed9..8b9e0a95de31 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -175,6 +175,7 @@ nodes to be present and contain the properties described below.
                            "marvell,pj4a"
                            "marvell,pj4b"
                            "marvell,sheeva-v5"
+                            "nvidia,tegra132-denver"
                            "qcom,krait"
                            "qcom,scorpion"
        - enable-method
diff --git a/Documentation/devicetree/bindings/arm/digicolor.txt b/Documentation/devicetree/bindings/arm/digicolor.txt
new file mode 100644
index 000000000000..658553f40b23
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/digicolor.txt
@@ -0,0 +1,6 @@
+Conexant Digicolor Platforms Device Tree Bindings
+Each device tree must specify which Conexant Digicolor SoC it uses.
+Must be the following compatible string:
+  cnxt,cx92755
diff --git a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
index abde1ea8a119..f4445e5a2bbb 100644
--- a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
+++ b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
@@ -23,7 +23,7 @@ Optional Properties:
                devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
                are supported currently.
-Node of a device using power domains must have a samsung,power-domain property
+Node of a device using power domains must have a power-domains property
 defined with a phandle to respective power domain.
 Example:
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index 4e8b7df7fc62..a5462b6b3c30 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -75,6 +75,18 @@ i.MX6q generic board
 Required root node properties:
    - compatible = "fsl,imx6q";
+Freescale Vybrid Platform Device Tree Bindings
+----------------------------------------------
+For the Vybrid SoC familiy all variants with DDR controller are supported,
+which is the VF5xx and VF6xx series. Out of historical reasons, in most
+places the kernel uses vf610 to refer to the whole familiy.
+Required root node compatible property (one of them):
+    - compatible = "fsl,vf500";
+    - compatible = "fsl,vf510";
+    - compatible = "fsl,vf600";
+    - compatible = "fsl,vf610";
 Freescale LS1021A Platform Device Tree Bindings
 ------------------------------------------------
@@ -112,3 +124,11 @@ Example:
                compatible = "fsl,ls1021a-dcfg";
                reg = <0x0 0x1ee0000 0x0 0x10000>;
        };
+Freescale LS2085A SoC Device Tree Bindings
+------------------------------------------
+LS2085A ARMv8 based Simulator model
+Required root node properties:
+    - compatible = "fsl,ls2085a-simu", "fsl,ls2085a";
diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt
index 8112d0c3675a..c97484b73e72 100644
--- a/Documentation/devicetree/bindings/arm/gic.txt
+++ b/Documentation/devicetree/bindings/arm/gic.txt
@@ -32,12 +32,16 @@ Main node required properties:
  The 3rd cell is the flags, encoded as follows:
        bits[3:0] trigger type and level flags.
                1 = low-to-high edge triggered
-                2 = high-to-low edge triggered
+                2 = high-to-low edge triggered (invalid for SPIs)
                4 = active high level-sensitive
-                8 = active low level-sensitive
+                8 = active low level-sensitive (invalid for SPIs).
        bits[15:8] PPI interrupt cpu mask.  Each bit corresponds to each of
        the 8 possible cpus attached to the GIC.  A bit set to '1' indicated
        the interrupt is wired to that CPU.  Only valid for PPI interrupts.
+        Also note that the configurability of PPI interrupts is IMPLEMENTATION
+        DEFINED and as such not guaranteed to be present (most SoC available
+        in 2014 seem to ignore the setting of this flag and use the hardware
+        default value).
 - reg : Specifies base physical address(s) and size of the GIC registers. The
  first region is the GIC distributor register base and size. The 2nd region is
diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
index f717c7b48603..35b1bd49cfa1 100644
--- a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
+++ b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
@@ -9,6 +9,10 @@ HiP04 D01 Board
 Required root node properties:
        - compatible = "hisilicon,hip04-d01";
+HiP01 ca9x2 Board
+Required root node properties:
+        - compatible = "hisilicon,hip01-ca9x2";
 Hisilicon system controller
@@ -37,6 +41,27 @@ Example:
        };
 -----------------------------------------------------------------------
+Hisilicon HiP01 system controller
+Required properties:
+- compatible : "hisilicon,hip01-sysctrl"
+- reg : Register address and size
+The HiP01 system controller is mostly compatible with hisilicon
+system controller,but it has some specific control registers for
+HIP01 SoC family, such as slave core boot, and also some same
+registers located at different offset.
+Example:
+        /* for hip01-ca9x2 */
+        sysctrl: system-controller@10000000 {
+                compatible = "hisilicon,hip01-sysctrl", "hisilicon,sysctrl";
+                reg = <0x10000000 0x1000>;
+                reboot-offset = <0x4>;
+        };
+-----------------------------------------------------------------------
 Hisilicon CPU controller
 Required properties:
diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt b/Documentation/devicetree/bindings/arm/l2cc.txt
index 292ef7ca3058..0dbabe9a6b0a 100644
--- a/Documentation/devicetree/bindings/arm/l2cc.txt
+++ b/Documentation/devicetree/bindings/arm/l2cc.txt
@@ -57,6 +57,16 @@ Optional properties:
 - cache-id-part: cache id part number to be used if it is not present
  on hardware
 - wt-override: If present then L2 is forced to Write through mode
+- arm,double-linefill : Override double linefill enable setting. Enable if
+  non-zero, disable if zero.
+- arm,double-linefill-incr : Override double linefill on INCR read. Enable
+  if non-zero, disable if zero.
+- arm,double-linefill-wrap : Override double linefill on WRAP read. Enable
+  if non-zero, disable if zero.
+- arm,prefetch-drop : Override prefetch drop enable setting. Enable if non-zero,
+  disable if zero.
+- arm,prefetch-offset : Override prefetch offset value. Valid values are
+  0-7, 15, 23, and 31.
 Example:
diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt
index 3be40139cfbb..dd7550a29db6 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek.txt
@@ -9,6 +9,7 @@ compatible: Must contain one of
   "mediatek,mt6592"
   "mediatek,mt8127"
   "mediatek,mt8135"
+   "mediatek,mt8173"
 Supported boards:
@@ -25,3 +26,6 @@ Supported boards:
 - MTK mt8135 tablet EVB:
    Required root node properties:
      - compatible = "mediatek,mt8135-evbp1", "mediatek,mt8135";
+- MTK mt8173 tablet EVB:
+    Required root node properties:
+      - compatible = "mediatek,mt8173-evb", "mediatek,mt8173";
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
index d680b07ec6e8..4f5a5352ccd8 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
@@ -5,8 +5,10 @@ interrupt.
 Required properties:
 - compatible: should be one of:
+        "mediatek,mt8173-sysirq"
        "mediatek,mt8135-sysirq"
        "mediatek,mt8127-sysirq"
+        "mediatek,mt6592-sysirq"
        "mediatek,mt6589-sysirq"
        "mediatek,mt6582-sysirq"
        "mediatek,mt6577-sysirq"
diff --git a/Documentation/devicetree/bindings/arm/msm/timer.txt b/Documentation/devicetree/bindings/arm/msm/timer.txt
index c6ef8f13dc7e..74607b6c1117 100644
--- a/Documentation/devicetree/bindings/arm/msm/timer.txt
+++ b/Documentation/devicetree/bindings/arm/msm/timer.txt
@@ -8,7 +8,7 @@ Properties:
               "qcom,kpss-timer" - krait subsystem
               "qcom,scss-timer" - scorpion subsystem
- interrupts : Interrupts for the the debug timer, the first general purpose
+- interrupts : Interrupts for the debug timer, the first general purpose
               timer, and optionally a second general purpose timer in that
               order.
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index eaa3d1a0eb05..6809e4e51ed2 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -9,6 +9,16 @@ Rockchip platforms device tree bindings
    Required root node properties:
      - compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
+- ChipSPARK Rayeager PX2 board:
+    Required root node properties:
+      - compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";
 - Radxa Rock board:
    Required root node properties:
      - compatible = "radxa,rock", "rockchip,rk3188";
+- Firefly Firefly-RK3288 board:
+    Required root node properties:
+      - compatible = "firefly,firefly-rk3288", "rockchip,rk3288";
+    or
+      - compatible = "firefly,firefly-rk3288-beta", "rockchip,rk3288";
diff --git a/Documentation/devicetree/bindings/arm/rockchip/pmu-sram.txt b/Documentation/devicetree/bindings/arm/rockchip/pmu-sram.txt
new file mode 100644
index 000000000000..6b42fda306ff
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/rockchip/pmu-sram.txt
@@ -0,0 +1,16 @@
+Rockchip SRAM for pmu:
+------------------------------
+The sram of pmu is used to store the function of resume from maskrom(the 1st
+level loader). This is a common use of the "pmu-sram" because it keeps power
+even in low power states in the system.
+Required node properties:
+- compatible : should be "rockchip,rk3288-pmu-sram"
+- reg : physical base address and the size of the registers window
+Example:
+        sram@ff720000 {
+                compatible = "rockchip,rk3288-pmu-sram", "mmio-sram";
+                reg = <0xff720000 0x1000>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt
new file mode 100644
index 000000000000..85c5dfd4a720
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt
@@ -0,0 +1,12 @@
+SAMSUNG Exynos SoCs Chipid driver.
+Required properties:
+- compatible : Should at least contain "samsung,exynos4210-chipid".
+- reg: offset and length of the register set
+Example:
+        chipid@10000000 {
+                compatible = "samsung,exynos4210-chipid";
+                reg = <0x10000000 0x100>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt
index 1e1979b229ff..67b211381f2b 100644
--- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt
@@ -10,6 +10,7 @@ Properties:
                   - "samsung,exynos5260-pmu" - for Exynos5260 SoC.
                   - "samsung,exynos5410-pmu" - for Exynos5410 SoC,
                   - "samsung,exynos5420-pmu" - for Exynos5420 SoC.
+                   - "samsung,exynos7-pmu" - for Exynos7 SoC.
                second value must be always "syscon".
 - reg : offset and length of the register set.
diff --git a/Documentation/devicetree/bindings/arm/sirf.txt b/Documentation/devicetree/bindings/arm/sirf.txt
index c6ba6d3c747f..7b28ee6fee91 100644
--- a/Documentation/devicetree/bindings/arm/sirf.txt
+++ b/Documentation/devicetree/bindings/arm/sirf.txt
@@ -3,7 +3,9 @@ CSR SiRFprimaII and SiRFmarco device tree bindings.
 Required root node properties:
    - compatible:
+    - "sirf,atlas6-cb" : atlas6 "cb" evaluation board
+    - "sirf,atlas6" : atlas6 device based board
+    - "sirf,atlas7-cb" : atlas7 "cb" evaluation board
+    - "sirf,atlas7" : atlas7 device based board
    - "sirf,prima2-cb" : prima2 "cb" evaluation board
-    - "sirf,marco-cb" : marco "cb" evaluation board
    - "sirf,prima2" : prima2 device based board
-    - "sirf,marco" : marco device based board
diff --git a/Documentation/devicetree/bindings/arm/sprd.txt b/Documentation/devicetree/bindings/arm/sprd.txt
new file mode 100644
index 000000000000..31a629dc75b8
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/sprd.txt
@@ -0,0 +1,11 @@
+Spreadtrum SoC Platforms Device Tree Bindings
+----------------------------------------------------
+Sharkl64 is a Spreadtrum's SoC Platform which is based
+on ARM 64-bit processor.
+SC9836 openphone board with SC9836 SoC based on the
+Sharkl64 Platform shall have the following properties.
+Required root node properties:
+        - compatible = "sprd,sc9836-openphone", "sprd,sc9836";
diff --git a/Documentation/devicetree/bindings/arm/sti.txt b/Documentation/devicetree/bindings/arm/sti.txt
index 92f16c78bb69..d70ec358736c 100644
--- a/Documentation/devicetree/bindings/arm/sti.txt
+++ b/Documentation/devicetree/bindings/arm/sti.txt
@@ -13,3 +13,7 @@ Boards with the ST STiH407 SoC shall have the following properties:
 Required root node property:
 compatible = "st,stih407";
+Boards with the ST STiH418 SoC shall have the following properties:
+Required root node property:
+compatible = "st,stih418";
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt
index 234406d41c12..067c9790062f 100644
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt
@@ -1,7 +1,10 @@
 NVIDIA Tegra AHB
 Required properties:
- compatible : "nvidia,tegra20-ahb" or "nvidia,tegra30-ahb"
+- compatible : For Tegra20, must contain "nvidia,tegra20-ahb".  For
+  Tegra30, must contain "nvidia,tegra30-ahb".  Otherwise, must contain
+  '"nvidia,<chip>-ahb", "nvidia,tegra30-ahb"' where <chip> is tegra124,
+  tegra132, or tegra210.
 - reg : Should contain 1 register ranges(address and length)
 Example:
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
index 68ac65f82a1c..02c27004d4a8 100644
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
@@ -6,7 +6,11 @@ modes. It provides power-gating controllers for SoC and CPU power-islands.
 Required properties:
 - name : Should be pmc
- compatible : Should contain "nvidia,tegra<chip>-pmc".
+- compatible : For Tegra20, must contain "nvidia,tegra20-pmc".  For Tegra30,
+  must contain "nvidia,tegra30-pmc".  For Tegra114, must contain
+  "nvidia,tegra114-pmc".  For Tegra124, must contain "nvidia,tegra124-pmc".
+  Otherwise, must contain "nvidia,<chip>-pmc", plus at least one of the
+  above, where <chip> is tegra132.
 - reg : Offset and length of the register set for the device
 - clocks : Must contain an entry for each entry in clock-names.
  See ../clocks/clock-bindings.txt for details.
@@ -47,6 +51,23 @@ Required properties when nvidia,suspend-mode=<0>:
  sleep mode, the warm boot code will restore some PLLs, clocks and then
  bring up CPU0 for resuming the system.
+Hardware-triggered thermal reset:
+On Tegra30, Tegra114 and Tegra124, if the 'i2c-thermtrip' subnode exists,
+hardware-triggered thermal reset will be enabled.
+Required properties for hardware-triggered thermal reset (inside 'i2c-thermtrip'):
+- nvidia,i2c-controller-id : ID of I2C controller to send poweroff command to. Valid values are
+                             described in section 9.2.148 "APBDEV_PMC_SCRATCH53_0" of the
+                             Tegra K1 Technical Reference Manual.
+- nvidia,bus-addr : Bus address of the PMU on the I2C bus
+- nvidia,reg-addr : I2C register address to write poweroff command to
+- nvidia,reg-data : Poweroff command to write to PMU
+Optional properties for hardware-triggered thermal reset (inside 'i2c-thermtrip'):
+- nvidia,pinmux-id : Pinmux used by the hardware when issuing poweroff command.
+                     Defaults to 0. Valid values are described in section 12.5.2
+                     "Pinmux Support" of the Tegra4 Technical Reference Manual.
 Example:
 / SoC dts including file
@@ -69,6 +90,15 @@ pmc@7000f400 {
 / Tegra board dts file
 {
        ...
+        pmc@7000f400 {
+                i2c-thermtrip {
+                        nvidia,i2c-controller-id = <4>;
+                        nvidia,bus-addr = <0x40>;
+                        nvidia,reg-addr = <0x36>;
+                        nvidia,reg-data = <0x2>;
+                };
+        };
+        ...
        clocks {
                compatible = "simple-bus";
                #address-cells = <1>;
diff --git a/Documentation/devicetree/bindings/arm/versatile-sysreg.txt b/Documentation/devicetree/bindings/arm/versatile-sysreg.txt
new file mode 100644
index 000000000000..a4f15262d717
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/versatile-sysreg.txt
@@ -0,0 +1,10 @@
+ARM Versatile system registers
+--------------------------------------
+This is a system control registers block, providing multiple low level
+platform functions like board detection and identification, software
+interrupt generation, MMC and NOR Flash control etc.
+Required node properties:
+- compatible value : = "arm,versatile-sysreg", "syscon"
+- reg : physical base address and the size of the registers window
diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt
index 4ab09f2202d4..c2340eeeb97f 100644
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@ -37,9 +37,10 @@ Required properties when using sub-nodes:
 Sub-nodes required properties:
- reg               : the port number
+- reg               : the port number
- phys              : reference to the SATA PHY node
+And at least one of the following properties:
+- phys              : reference to the SATA PHY node
+- target-supply    : regulator for SATA target power
 Examples:
        sata@ffe08000 {
@@ -68,10 +69,12 @@ With sub-nodes:
                sata0: sata-port@0 {
                        reg = <0>;
                        phys = <&sata_phy 0>;
+                        target-supply = <&reg_sata0>;
                };
                sata1: sata-port@1 {
                        reg = <1>;
                        phys = <&sata_phy 1>;
+                        target-supply = <&reg_sata1>;;
                };
        };
diff --git a/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt b/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt
index 93986a5a8018..3bacc8e0931e 100644
--- a/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt
+++ b/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt
@@ -9,7 +9,7 @@ Properties:
  Compatibility with many Cavium evaluation boards.
- reg: The base address of the the CF chip select banks.  Depending on
+- reg: The base address of the CF chip select banks.  Depending on
  the device configuration, there may be one or two banks.
 - cavium,bus-width: The width of the connection to the CF devices.  Valid
diff --git a/Documentation/devicetree/bindings/ata/tegra-sata.txt b/Documentation/devicetree/bindings/ata/tegra-sata.txt
index 946f2072570b..66c83c3e8915 100644
--- a/Documentation/devicetree/bindings/ata/tegra-sata.txt
+++ b/Documentation/devicetree/bindings/ata/tegra-sata.txt
@@ -1,7 +1,9 @@
 Tegra124 SoC SATA AHCI controller
 Required properties :
- compatible : "nvidia,tegra124-ahci".
+- compatible : For Tegra124, must contain "nvidia,tegra124-ahci".  Otherwise,
+  must contain '"nvidia,<chip>-ahci", "nvidia,tegra124-ahci"', where <chip>
+  is tegra132.
 - reg : Should contain 2 entries:
  - AHCI register set (SATA BAR5)
  - SATA register set
diff --git a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
index 5e16c3ccb061..fa6cde41b460 100644
--- a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
+++ b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
@@ -6,8 +6,8 @@ Required properties:
 - compatible:    Should be set to one of the following:
                 marvell,armada370-mbus
                 marvell,armadaxp-mbus
-                 marvell,armada370-mbus
+                 marvell,armada375-mbus
-                 marvell,armadaxp-mbus
+                 marvell,armada380-mbus
                 marvell,kirkwood-mbus
                 marvell,dove-mbus
                 marvell,orion5x-88f5281-mbus
diff --git a/Documentation/devicetree/bindings/c6x/dscr.txt b/Documentation/devicetree/bindings/c6x/dscr.txt
index b0e97144cfb1..92672235de57 100644
--- a/Documentation/devicetree/bindings/c6x/dscr.txt
+++ b/Documentation/devicetree/bindings/c6x/dscr.txt
@@ -12,7 +12,7 @@ configuration register for writes. These configuration register may be used to
 enable (and disable in some cases) SoC pin drivers, select peripheral clock
 sources (internal or pin), etc. In some cases, a configuration register is
 write once or the individual bits are write once. In addition to device config,
-the DSCR block may provide registers which which are used to reset peripherals,
+the DSCR block may provide registers which are used to reset peripherals,
 provide device ID information, provide ethernet MAC addresses, as well as other
 miscellaneous functions.
diff --git a/Documentation/devicetree/bindings/clock/alphascale,acc.txt b/Documentation/devicetree/bindings/clock/alphascale,acc.txt
new file mode 100644
index 000000000000..62e67e883e76
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/alphascale,acc.txt
@@ -0,0 +1,115 @@
+Alphascale Clock Controller
+The ACC (Alphascale Clock Controller) is responsible of choising proper
+clock source, setting deviders and clock gates.
+Required properties for the ACC node:
+ - compatible: must be "alphascale,asm9260-clock-controller"
+ - reg: must contain the ACC register base and size
+ - #clock-cells : shall be set to 1.
+Simple one-cell clock specifier format is used, where the only cell is used
+as an index of the clock inside the provider.
+It is encouraged to use dt-binding for clock index definitions. SoC specific
+dt-binding should be included to the device tree descriptor. For example
+Alphascale ASM9260:
+#include <dt-bindings/clock/alphascale,asm9260.h>
+This binding contains two types of clock providers:
+ _AHB_ - AHB gate;
+ _SYS_ - adjustable clock source. Not all peripheral have _SYS_ clock provider.
+All clock specific details can be found in the SoC documentation.
+CLKID_AHB_ROM           0
+CLKID_AHB_RAM           1
+CLKID_AHB_GPIO          2
+CLKID_AHB_MAC           3
+CLKID_AHB_EMI           4
+CLKID_AHB_USB0          5
+CLKID_AHB_USB1          6
+CLKID_AHB_DMA0          7
+CLKID_AHB_DMA1          8
+CLKID_AHB_UART0         9
+CLKID_AHB_UART1         10
+CLKID_AHB_UART2         11
+CLKID_AHB_UART3         12
+CLKID_AHB_UART4         13
+CLKID_AHB_UART5         14
+CLKID_AHB_UART6         15
+CLKID_AHB_UART7         16
+CLKID_AHB_UART8         17
+CLKID_AHB_UART9         18
+CLKID_AHB_I2S0          19
+CLKID_AHB_I2C0          20
+CLKID_AHB_I2C1          21
+CLKID_AHB_SSP0          22
+CLKID_AHB_IOCONFIG      23
+CLKID_AHB_WDT           24
+CLKID_AHB_CAN0          25
+CLKID_AHB_CAN1          26
+CLKID_AHB_MPWM          27
+CLKID_AHB_SPI0          28
+CLKID_AHB_SPI1          29
+CLKID_AHB_QEI           30
+CLKID_AHB_QUADSPI0      31
+CLKID_AHB_CAMIF         32
+CLKID_AHB_LCDIF         33
+CLKID_AHB_TIMER0        34
+CLKID_AHB_TIMER1        35
+CLKID_AHB_TIMER2        36
+CLKID_AHB_TIMER3        37
+CLKID_AHB_IRQ           38
+CLKID_AHB_RTC           39
+CLKID_AHB_NAND          40
+CLKID_AHB_ADC0          41
+CLKID_AHB_LED           42
+CLKID_AHB_DAC0          43
+CLKID_AHB_LCD           44
+CLKID_AHB_I2S1          45
+CLKID_AHB_MAC1          46
+CLKID_SYS_CPU           47
+CLKID_SYS_AHB           48
+CLKID_SYS_I2S0M         49
+CLKID_SYS_I2S0S         50
+CLKID_SYS_I2S1M         51
+CLKID_SYS_I2S1S         52
+CLKID_SYS_UART0         53
+CLKID_SYS_UART1         54
+CLKID_SYS_UART2         55
+CLKID_SYS_UART3         56
+CLKID_SYS_UART4         56
+CLKID_SYS_UART5         57
+CLKID_SYS_UART6         58
+CLKID_SYS_UART7         59
+CLKID_SYS_UART8         60
+CLKID_SYS_UART9         61
+CLKID_SYS_SPI0          62
+CLKID_SYS_SPI1          63
+CLKID_SYS_QUADSPI       64
+CLKID_SYS_SSP0          65
+CLKID_SYS_NAND          66
+CLKID_SYS_TRACE         67
+CLKID_SYS_CAMM          68
+CLKID_SYS_WDT           69
+CLKID_SYS_CLKOUT        70
+CLKID_SYS_MAC           71
+CLKID_SYS_LCD           72
+CLKID_SYS_ADCANA        73
+Example of clock consumer with _SYS_ and _AHB_ sinks.
+uart4: serial@80010000 {
+        compatible = "alphascale,asm9260-uart";
+        reg = <0x80010000 0x4000>;
+        clocks = <&acc CLKID_SYS_UART4>, <&acc CLKID_AHB_UART4>;
+        interrupts = <19>;
+        status = "disabled";
+};
+Clock consumer with only one, _AHB_ sink.
+timer0: timer@80088000 {
+        compatible = "alphascale,asm9260-timer";
+        reg = <0x80088000 0x4000>;
+        clocks = <&acc CLKID_AHB_TIMER0>;
+        interrupts = <29>;
+};
diff --git a/Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt
new file mode 100644
index 000000000000..a8978ec94831
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt
@@ -0,0 +1,35 @@
+These bindings should be considered EXPERIMENTAL for now.
+* Renesas SH73A0 Clock Pulse Generator (CPG)
+The CPG generates core clocks for the SH73A0 SoC. It includes four PLLs
+and several fixed ratio dividers.
+Required Properties:
+  - compatible: Must be "renesas,sh73a0-cpg-clocks"
+  - reg: Base address and length of the memory resource used by the CPG
+  - clocks: Reference to the parent clocks ("extal1" and "extal2")
+  - #clock-cells: Must be 1
+  - clock-output-names: The names of the clocks. Supported clocks are "main",
+    "pll0", "pll1", "pll2", "pll3", "dsi0phy", "dsi1phy", "zg", "m3", "b",
+    "m1", "m2", "z", "zx", and "hp".
+Example
+-------
+        cpg_clocks: cpg_clocks@e6150000 {
+                compatible = "renesas,sh73a0-cpg-clocks";
+                reg = <0 0xe6150000 0 0x10000>;
+                clocks = <&extal1_clk>, <&extal2_clk>;
+                #clock-cells = <1>;
+                clock-output-names = "main", "pll0", "pll1", "pll2",
+                                     "pll3", "dsi0phy", "dsi1phy",
+                                     "zg", "m3", "b", "m1", "m2",
+                                     "z", "zx", "hp";
+        };
diff --git a/Documentation/devicetree/bindings/devfreq/event/exynos-ppmu.txt b/Documentation/devicetree/bindings/devfreq/event/exynos-ppmu.txt
new file mode 100644
index 000000000000..b54bf3a2ff57
--- /dev/null
+++ b/Documentation/devicetree/bindings/devfreq/event/exynos-ppmu.txt
@@ -0,0 +1,110 @@
+* Samsung Exynos PPMU (Platform Performance Monitoring Unit) device
+The Samsung Exynos SoC has PPMU (Platform Performance Monitoring Unit) for
+each IP. PPMU provides the primitive values to get performance data. These
+PPMU events provide information of the SoC's behaviors so that you may
+use to analyze system performance, to make behaviors visible and to count
+usages of each IP (DMC, CPU, RIGHTBUS, LEFTBUS, CAM interface, LCD, G3D, MFC).
+The Exynos PPMU driver uses the devfreq-event class to provide event data
+to various devfreq devices. The devfreq devices would use the event data when
+derterming the current state of each IP.
+Required properties:
+- compatible: Should be "samsung,exynos-ppmu".
+- reg: physical base address of each PPMU and length of memory mapped region.
+Optional properties:
+- clock-names : the name of clock used by the PPMU, "ppmu"
+- clocks : phandles for clock specified in "clock-names" property
+- #clock-cells: should be 1.
+Example1 : PPMU nodes in exynos3250.dtsi are listed below.
+                ppmu_dmc0: ppmu_dmc0@106a0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x106a0000 0x2000>;
+                        status = "disabled";
+                };
+                ppmu_dmc1: ppmu_dmc1@106b0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x106b0000 0x2000>;
+                        status = "disabled";
+                };
+                ppmu_cpu: ppmu_cpu@106c0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x106c0000 0x2000>;
+                        status = "disabled";
+                };
+                ppmu_rightbus: ppmu_rightbus@112a0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x112a0000 0x2000>;
+                        clocks = <&cmu CLK_PPMURIGHT>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
+                ppmu_leftbus: ppmu_leftbus0@116a0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x116a0000 0x2000>;
+                        clocks = <&cmu CLK_PPMULEFT>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
+Example2 : Events of each PPMU node in exynos3250-rinato.dts are listed below.
+        &ppmu_dmc0 {
+                status = "okay";
+                events {
+                        ppmu_dmc0_3: ppmu-event3-dmc0 {
+                                event-name = "ppmu-event3-dmc0";
+                        };
+                        ppmu_dmc0_2: ppmu-event2-dmc0 {
+                                event-name = "ppmu-event2-dmc0";
+                        };
+                        ppmu_dmc0_1: ppmu-event1-dmc0 {
+                                event-name = "ppmu-event1-dmc0";
+                        };
+                        ppmu_dmc0_0: ppmu-event0-dmc0 {
+                                event-name = "ppmu-event0-dmc0";
+                        };
+                };
+        };
+        &ppmu_dmc1 {
+                status = "okay";
+                events {
+                        ppmu_dmc1_3: ppmu-event3-dmc1 {
+                                event-name = "ppmu-event3-dmc1";
+                        };
+                };
+        };
+        &ppmu_leftbus {
+                status = "okay";
+                events {
+                        ppmu_leftbus_3: ppmu-event3-leftbus {
+                                event-name = "ppmu-event3-leftbus";
+                        };
+                };
+        };
+        &ppmu_rightbus {
+                status = "okay";
+                events {
+                        ppmu_rightbus_3: ppmu-event3-rightbus {
+                                event-name = "ppmu-event3-rightbus";
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/dma/img-mdc-dma.txt b/Documentation/devicetree/bindings/dma/img-mdc-dma.txt
new file mode 100644
index 000000000000..28c1341db346
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/img-mdc-dma.txt
@@ -0,0 +1,57 @@
+* IMG Multi-threaded DMA Controller (MDC)
+Required properties:
+- compatible: Must be "img,pistachio-mdc-dma".
+- reg: Must contain the base address and length of the MDC registers.
+- interrupts: Must contain all the per-channel DMA interrupts.
+- 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:
+  - sys: MDC system interface clock.
+- img,cr-periph: Must contain a phandle to the peripheral control syscon
+  node which contains the DMA request to channel mapping registers.
+- img,max-burst-multiplier: Must be the maximum supported burst size multiplier.
+  The maximum burst size is this value multiplied by the hardware-reported bus
+  width.
+- #dma-cells: Must be 3:
+  - The first cell is the peripheral's DMA request line.
+  - The second cell is a bitmap specifying to which channels the DMA request
+    line may be mapped (i.e. bit N set indicates channel N is usable).
+  - The third cell is the thread ID to be used by the channel.
+Optional properties:
+- dma-channels: Number of supported DMA channels, up to 32.  If not specified
+  the number reported by the hardware is used.
+Example:
+mdc: dma-controller@18143000 {
+        compatible = "img,pistachio-mdc-dma";
+        reg = <0x18143000 0x1000>;
+        interrupts = <GIC_SHARED 27 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 28 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 29 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 30 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 31 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 32 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 33 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 34 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 35 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 36 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 37 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SHARED 38 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&system_clk>;
+        clock-names = "sys";
+        img,max-burst-multiplier = <16>;
+        img,cr-periph = <&cr_periph>;
+        #dma-cells = <3>;
+};
+spi@18100f00 {
+        ...
+        dmas = <&mdc 9 0xffffffff 0>, <&mdc 10 0xffffffff 0>;
+        dma-names = "tx", "rx";
+        ...
+};
diff --git a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
index df0f48bcf75a..09daeef1ff22 100644
--- a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
+++ b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
@@ -1,13 +1,10 @@
 * Renesas R-Car DMA Controller Device Tree bindings
-Renesas R-Car Generation 2 SoCs have have multiple multi-channel DMA
+Renesas R-Car Generation 2 SoCs have multiple multi-channel DMA
 controller instances named DMAC capable of serving multiple clients. Channels
 can be dedicated to specific clients or shared between a large number of
 clients.
-DMA clients are connected to the DMAC ports referenced by an 8-bit identifier
-called MID/RID.
 Each DMA client is connected to one dedicated port of the DMAC, identified by
 an 8-bit port number called the MID/RID. A DMA controller can thus serve up to
 256 clients in total. When the number of hardware channels is lower than the
diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt
index d58675ea1abf..c261598164a7 100644
--- a/Documentation/devicetree/bindings/dma/snps-dma.txt
+++ b/Documentation/devicetree/bindings/dma/snps-dma.txt
@@ -38,7 +38,7 @@ Example:
                chan_allocation_order = <1>;
                chan_priority = <1>;
                block_size = <0xfff>;
-                data_width = <3 3 0 0>;
+                data_width = <3 3>;
        };
 DMA clients connected to the Designware DMA controller must use the format
diff --git a/Documentation/devicetree/bindings/drm/atmel/hlcdc-dc.txt b/Documentation/devicetree/bindings/drm/atmel/hlcdc-dc.txt
new file mode 100644
index 000000000000..ebc1a914bda3
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/atmel/hlcdc-dc.txt
@@ -0,0 +1,53 @@
+Device-Tree bindings for Atmel's HLCDC (High LCD Controller) DRM driver
+The Atmel HLCDC Display Controller is subdevice of the HLCDC MFD device.
+See ../mfd/atmel-hlcdc.txt for more details.
+Required properties:
+ - compatible: value should be "atmel,hlcdc-display-controller"
+ - pinctrl-names: the pin control state names. Should contain "default".
+ - pinctrl-0: should contain the default pinctrl states.
+ - #address-cells: should be set to 1.
+ - #size-cells: should be set to 0.
+Required children nodes:
+ Children nodes are encoding available output ports and their connections
+ to external devices using the OF graph reprensentation (see ../graph.txt).
+ At least one port node is required.
+Example:
+        hlcdc: hlcdc@f0030000 {
+                compatible = "atmel,sama5d3-hlcdc";
+                reg = <0xf0030000 0x2000>;
+                interrupts = <36 IRQ_TYPE_LEVEL_HIGH 0>;
+                clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
+                clock-names = "periph_clk","sys_clk", "slow_clk";
+                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/drm/bridge/dw_hdmi.txt b/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt
new file mode 100644
index 000000000000..a905c1413558
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt
@@ -0,0 +1,50 @@
+DesignWare HDMI bridge bindings
+Required properties:
+- compatible: platform specific such as:
+   * "snps,dw-hdmi-tx"
+   * "fsl,imx6q-hdmi"
+   * "fsl,imx6dl-hdmi"
+   * "rockchip,rk3288-dw-hdmi"
+- reg: Physical base address and length of the controller's registers.
+- interrupts: The HDMI interrupt number
+- clocks, clock-names : must have the phandles to the HDMI iahb and isfr clocks,
+  as described in Documentation/devicetree/bindings/clock/clock-bindings.txt,
+  the clocks are soc specific, the clock-names should be "iahb", "isfr"
+-port@[X]: SoC specific port nodes with endpoint definitions as defined
+   in Documentation/devicetree/bindings/media/video-interfaces.txt,
+   please refer to the SoC specific binding document:
+    * Documentation/devicetree/bindings/drm/imx/hdmi.txt
+    * Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt
+Optional properties
+- reg-io-width: the width of the reg:1,4, default set to 1 if not present
+- ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
+- clocks, clock-names: phandle to the HDMI CEC clock, name should be "cec"
+Example:
+        hdmi: hdmi@0120000 {
+                compatible = "fsl,imx6q-hdmi";
+                reg = <0x00120000 0x9000>;
+                interrupts = <0 115 0x04>;
+                gpr = <&gpr>;
+                clocks = <&clks 123>, <&clks 124>;
+                clock-names = "iahb", "isfr";
+                ddc-i2c-bus = <&i2c2>;
+                port@0 {
+                        reg = <0>;
+                        hdmi_mux_0: endpoint {
+                                remote-endpoint = <&ipu1_di0_hdmi>;
+                        };
+                };
+                port@1 {
+                        reg = <1>;
+                        hdmi_mux_1: endpoint {
+                                remote-endpoint = <&ipu1_di1_hdmi>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/drm/msm/hdmi.txt b/Documentation/devicetree/bindings/drm/msm/hdmi.txt
index aca917fe2ba7..a29a55f3d937 100644
--- a/Documentation/devicetree/bindings/drm/msm/hdmi.txt
+++ b/Documentation/devicetree/bindings/drm/msm/hdmi.txt
@@ -2,6 +2,8 @@ Qualcomm adreno/snapdragon hdmi output
 Required properties:
 - compatible: one of the following
+   * "qcom,hdmi-tx-8084"
+   * "qcom,hdmi-tx-8074"
   * "qcom,hdmi-tx-8660"
   * "qcom,hdmi-tx-8960"
 - reg: Physical base address and length of the controller's registers
diff --git a/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt b/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt
new file mode 100644
index 000000000000..9b027a615486
--- /dev/null
+++ b/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt
@@ -0,0 +1,17 @@
+Altera SOCFPGA FPGA Manager
+Required properties:
+- compatible : should contain "altr,socfpga-fpga-mgr"
+- reg        : base address and size for memory mapped io.
+               - The first index is for FPGA manager register access.
+               - The second index is for writing FPGA configuration data.
+- interrupts : interrupt for the FPGA Manager device.
+Example:
+        hps_0_fpgamgr: fpgamgr@0xff706000 {
+                compatible = "altr,socfpga-fpga-mgr";
+                reg = <0xFF706000 0x1000
+                       0xFFB90000 0x1000>;
+                interrupts = <0 175 4>;
+        };
diff --git a/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt b/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt
index d8c98c7614d0..23e1d3194174 100644
--- a/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt
+++ b/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt
@@ -1,11 +1,11 @@
 NVIDIA Tegra20/Tegra30/Tegr114/Tegra124 fuse block.
 Required properties:
- compatible : should be:
+- compatible : For Tegra20, must contain "nvidia,tegra20-efuse".  For Tegra30,
-        "nvidia,tegra20-efuse"
+  must contain "nvidia,tegra30-efuse".  For Tegra114, must contain
-        "nvidia,tegra30-efuse"
+  "nvidia,tegra114-efuse".  For Tegra124, must contain "nvidia,tegra124-efuse".
-        "nvidia,tegra114-efuse"
+  Otherwise, must contain "nvidia,<chip>-efuse", plus one of the above, where
-        "nvidia,tegra124-efuse"
+  <chip> is tegra132.
  Details:
  nvidia,tegra20-efuse: Tegra20 requires using APB DMA to read the fuse data
        due to a hardware bug. Tegra20 also lacks certain information which is
diff --git a/Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt b/Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt
new file mode 100644
index 000000000000..bef353f370d8
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt
@@ -0,0 +1,20 @@
+Fujitsu MB86S7x GPIO Controller
+-------------------------------
+Required properties:
+- compatible: Should be "fujitsu,mb86s70-gpio"
+- reg: Base address and length of register space
+- clocks: Specify the clock
+- gpio-controller: Marks the device node as a gpio controller.
+- #gpio-cells: Should be <2>. The first cell is the pin number and the
+  second cell is used to specify optional parameters:
+   - bit 0 specifies polarity (0 for normal, 1 for inverted).
+Examples:
+        gpio0: gpio@31000000 {
+                compatible = "fujitsu,mb86s70-gpio";
+                reg = <0 0x31000000 0x10000>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                clocks = <&clk 0 2 1>;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/gpio-max732x.txt b/Documentation/devicetree/bindings/gpio/gpio-max732x.txt
new file mode 100644
index 000000000000..5fdc843b4542
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-max732x.txt
@@ -0,0 +1,59 @@
+* MAX732x-compatible I/O expanders
+Required properties:
+  - compatible: Should be one of the following:
+    - "maxim,max7319": For the Maxim MAX7319
+    - "maxim,max7320": For the Maxim MAX7320
+    - "maxim,max7321": For the Maxim MAX7321
+    - "maxim,max7322": For the Maxim MAX7322
+    - "maxim,max7323": For the Maxim MAX7323
+    - "maxim,max7324": For the Maxim MAX7324
+    - "maxim,max7325": For the Maxim MAX7325
+    - "maxim,max7326": For the Maxim MAX7326
+    - "maxim,max7327": For the Maxim MAX7327
+  - reg: I2C slave address for this device.
+  - gpio-controller: Marks the device node as a GPIO controller.
+  - #gpio-cells: Should be 2.
+    - first cell is the GPIO number
+    - second cell specifies GPIO flags, as defined in <dt-bindings/gpio/gpio.h>.
+      Only the GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW flags are supported.
+Optional properties:
+  The I/O expander can detect input state changes, and thus optionally act as
+  an interrupt controller. When the expander interrupt line is connected all the
+  following properties must be set. For more information please see the
+  interrupt controller device tree bindings documentation available at
+  Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.
+  - interrupt-controller: Identifies the node as an interrupt controller.
+  - #interrupt-cells: Number of cells to encode an interrupt source, shall be 2.
+    - first cell is the pin number
+    - second cell is used to specify flags
+  - interrupt-parent: phandle of the parent interrupt controller.
+  - interrupts: Interrupt specifier for the controllers interrupt.
+Please refer to gpio.txt in this directory for details of the common GPIO
+bindings used by client devices.
+Example 1. MAX7325 with interrupt support enabled (CONFIG_GPIO_MAX732X_IRQ=y):
+        expander: max7325@6d {
+                compatible = "maxim,max7325";
+                reg = <0x6d>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+                interrupt-parent = <&gpio4>;
+                interrupts = <29 IRQ_TYPE_EDGE_FALLING>;
+        };
+Example 2. MAX7325 with interrupt support disabled (CONFIG_GPIO_MAX732X_IRQ=n):
+        expander: max7325@6d {
+                compatible = "maxim,max7325";
+                reg = <0x6d>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt b/Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt
index d63194a2c848..ada4e2973323 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt
@@ -39,7 +39,7 @@ Optional Properties:
  - lines-initial-states: Bitmask that specifies the initial state of each
  line. When a bit is set to zero, the corresponding line will be initialized to
  the input (pulled-up) state. When the  bit is set to one, the line will be
-  initialized the the low-level output state. If the property is not specified
+  initialized the low-level output state. If the property is not specified
  all lines will be initialized to the input state.
  The I/O expander can detect input state changes, and thus optionally act as
diff --git a/Documentation/devicetree/bindings/gpio/gpio-sx150x.txt b/Documentation/devicetree/bindings/gpio/gpio-sx150x.txt
new file mode 100644
index 000000000000..ba2bb84eeac3
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-sx150x.txt
@@ -0,0 +1,40 @@
+SEMTECH SX150x GPIO expander bindings
+Required properties:
+- compatible: should be "semtech,sx1506q",
+                        "semtech,sx1508q",
+                        "semtech,sx1509q".
+- reg: The I2C slave address for this device.
+- interrupt-parent: phandle of the parent interrupt controller.
+- interrupts: Interrupt specifier for the controllers interrupt.
+- #gpio-cells: Should be 2. The first cell is the GPIO number and the
+                second cell is used to specify optional parameters:
+                bit 0: polarity (0: normal, 1: inverted)
+- gpio-controller: Marks the device as a GPIO controller.
+- interrupt-controller: Marks the device as a interrupt controller.
+The GPIO expander can optionally be used as an interrupt controller, in
+which case it uses the default two cell specifier as described in
+Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.
+Example:
+        i2c_gpio_expander@20{
+                #gpio-cells = <2>;
+                #interrupt-cells = <2>;
+                compatible = "semtech,sx1506q";
+                reg = <0x20>;
+                interrupt-parent = <&gpio_1>;
+                interrupts = <16 0>;
+                gpio-controller;
+                interrupt-controller;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt b/Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt
new file mode 100644
index 000000000000..dae130060537
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt
@@ -0,0 +1,32 @@
+APM X-Gene Standby GPIO controller bindings
+This is a gpio controller in the standby domain.
+There are 20 GPIO pins from 0..21. There is no GPIO_DS14 or GPIO_DS15,
+only GPIO_DS8..GPIO_DS13 support interrupts. The IRQ mapping
+is currently 1-to-1 on interrupts 0x28 thru 0x2d.
+Required properties:
+- compatible: "apm,xgene-gpio-sb" for the X-Gene Standby GPIO controller
+- reg: Physical base address and size of the controller's registers
+- #gpio-cells: Should be two.
+        - first cell is the pin number
+        - second cell is used to specify the gpio polarity:
+                0 = active high
+                1 = active low
+- gpio-controller: Marks the device node as a GPIO controller.
+- interrupts: Shall contain exactly 6 interrupts.
+Example:
+        sbgpio: sbgpio@17001000 {
+                compatible = "apm,xgene-gpio-sb";
+                reg = <0x0 0x17001000 0x0 0x400>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                interrupts =    <0x0 0x28 0x1>,
+                                <0x0 0x29 0x1>,
+                                <0x0 0x2a 0x1>,
+                                <0x0 0x2b 0x1>,
+                                <0x0 0x2c 0x1>,
+                                <0x0 0x2d 0x1>;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt
index b9bd1d64cfa6..f7a158d85862 100644
--- a/Documentation/devicetree/bindings/gpio/gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio.txt
@@ -69,7 +69,8 @@ GPIO pin number, and GPIO flags as accepted by the "qe_pio_e" gpio-controller.
 ----------------------------------
 A gpio-specifier should contain a flag indicating the GPIO polarity; active-
-high or active-low. If it does, the follow best practices should be followed:
+high or active-low. If it does, the following best practices should be
+followed:
 The gpio-specifier's polarity flag should represent the physical level at the
 GPIO controller that achieves (or represents, for inputs) a logically asserted
@@ -147,7 +148,7 @@ contains information structures as follows:
        numeric-gpio-range ::=
                        <pinctrl-phandle> <gpio-base> <pinctrl-base> <count>
        named-gpio-range ::= <pinctrl-phandle> <gpio-base> '<0 0>'
-        gpio-phandle : phandle to pin controller node.
+        pinctrl-phandle : phandle to pin controller node
        gpio-base : Base GPIO ID in the GPIO controller
        pinctrl-base : Base pinctrl pin ID in the pin controller
        count : The number of GPIOs/pins in this range
diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
index b2afdb27adeb..67a2e4e414a5 100644
--- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
@@ -3,8 +3,8 @@
 Required properties:
 - compatible : Should be "intel,pxa25x-gpio", "intel,pxa26x-gpio",
                "intel,pxa27x-gpio", "intel,pxa3xx-gpio",
-                "marvell,pxa93x-gpio", "marvell,mmp-gpio" or
+                "marvell,pxa93x-gpio", "marvell,mmp-gpio",
-                "marvell,mmp2-gpio".
+                "marvell,mmp2-gpio" or marvell,pxa1928-gpio.
 - reg : Address and length of the register set for the device
 - interrupts : Should be the port interrupt shared by all gpio pins.
  There're three gpio interrupts in arch-pxa, and they're gpio0,
diff --git a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
index 4c32ef0b7db8..009f4bfa1590 100644
--- a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
+++ b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -197,7 +197,9 @@ of the following host1x client modules:
 - sor: serial output resource
  Required properties:
-  - compatible: "nvidia,tegra124-sor"
+  - compatible: For Tegra124, must contain "nvidia,tegra124-sor".  Otherwise,
+    must contain '"nvidia,<chip>-sor", "nvidia,tegra124-sor"', where <chip>
+    is tegra132.
  - reg: Physical base address and length of the controller's registers.
  - interrupts: The interrupt outputs from the controller.
  - clocks: Must contain an entry for each entry in clock-names.
@@ -222,7 +224,9 @@ of the following host1x client modules:
  - nvidia,dpaux: phandle to a DispayPort AUX interface
 - dpaux: DisplayPort AUX interface
-  - compatible: "nvidia,tegra124-dpaux"
+  - compatible: For Tegra124, must contain "nvidia,tegra124-dpaux".  Otherwise,
+    must contain '"nvidia,<chip>-dpaux", "nvidia,tegra124-dpaux"', where
+    <chip> is tegra132.
  - reg: Physical base address and length of the controller's registers.
  - interrupts: The interrupt outputs from the controller.
  - clocks: Must contain an entry for each entry in clock-names.
diff --git a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt b/Documentation/devicetree/bindings/gpu/st,stih4xx.txt
index c99eb34e640b..6b1d75f1a529 100644
--- a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt
+++ b/Documentation/devicetree/bindings/gpu/st,stih4xx.txt
@@ -83,6 +83,22 @@ sti-hda:
  - clock-names: names of the clocks listed in clocks property in the same
    order.
+sti-dvo:
+  Required properties:
+  must be a child of sti-tvout
+  - compatible: "st,stih<chip>-dvo"
+  - reg: Physical base address of the IP registers and length of memory mapped region.
+  - reg-names: names of the mapped memory regions listed in regs property in
+    the same order.
+  - 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.
+  - pinctrl-0: pin control handle
+  - pinctrl-name: names of the pin control to use
+  - sti,panel: phandle of the panel connected to the DVO output
 sti-hqvdp:
  must be a child of sti-display-subsystem
  Required properties:
@@ -198,6 +214,19 @@ Example:
                                clock-names     = "pix", "hddac";
                                clocks          = <&clockgen_c_vcc CLK_S_PIX_HD>, <&clockgen_c_vcc CLK_S_HDDAC>;
                        };
+                        sti-dvo@8d00400 {
+                                compatible      = "st,stih407-dvo";
+                                reg             = <0x8d00400 0x200>;
+                                reg-names       = "dvo-reg";
+                                clock-names     = "dvo_pix", "dvo",
+                                                  "main_parent", "aux_parent";
+                                clocks          = <&clk_s_d2_flexgen CLK_PIX_DVO>, <&clk_s_d2_flexgen CLK_DVO>,
+                                                  <&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 1>;
+                                pinctrl-names   = "default";
+                                pinctrl-0       = <&pinctrl_dvo>;
+                                sti,panel       = <&panel_dvo>;
+                        };
                };
                sti-hqvdp@9c000000 {
diff --git a/Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt b/Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt
index 87507e9ce6db..656716b72cc4 100644
--- a/Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt
+++ b/Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt
@@ -1,11 +1,11 @@
 NVIDIA Tegra20/Tegra30/Tegra114 I2C controller driver.
 Required properties:
- compatible : should be:
+- compatible : For Tegra20, must be one of "nvidia,tegra20-i2c-dvc" or
-        "nvidia,tegra114-i2c"
+  "nvidia,tegra20-i2c".  For Tegra30, must be "nvidia,tegra30-i2c".
-        "nvidia,tegra30-i2c"
+  For Tegra114, must be "nvidia,tegra114-i2c".  Otherwise, must be
-        "nvidia,tegra20-i2c"
+  "nvidia,<chip>-i2c", plus at least one of the above, where <chip> is
-        "nvidia,tegra20-i2c-dvc"
+  tegra124, tegra132, or tegra210.
  Details of compatible are as follows:
  nvidia,tegra20-i2c-dvc: Tegra20 has specific I2C controller called as DVC I2C
        controller. This only support master mode of I2C communication. Register
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 9f41d05be3be..4dcd88d5f7ca 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -9,6 +9,7 @@ document for it just like any other devices.
 Compatible              Vendor / Chip
 ==========              =============
+abracon,abb5zes3                AB-RTCMC-32.768kHz-B5ZE-S3: Real Time Clock/Calendar Module with I2C Interface
 ad,ad7414               SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert and Over Temperature Pin
 ad,adm9240              ADM9240:  Complete System Hardware Monitor for uProcessor-Based Systems
 adi,adt7461             +/-1C TDM Extended Temp Range I.C
@@ -34,6 +35,7 @@ atmel,24c512		i2c serial eeprom  (24cxx)
 atmel,24c1024           i2c serial eeprom  (24cxx)
 atmel,at97sc3204t       i2c trusted platform module (TPM)
 capella,cm32181         CM32181: Ambient Light Sensor
+capella,cm3232          CM3232: Ambient Light Sensor
 catalyst,24c32          i2c serial eeprom
 cirrus,cs42l51          Cirrus Logic CS42L51 audio codec
 dallas,ds1307           64 x 8, Serial, I2C Real-Time Clock
diff --git a/Documentation/devicetree/bindings/iio/adc/cc10001_adc.txt b/Documentation/devicetree/bindings/iio/adc/cc10001_adc.txt
new file mode 100644
index 000000000000..904f76de9055
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/cc10001_adc.txt
@@ -0,0 +1,22 @@
+* Cosmic Circuits - Analog to Digital Converter (CC-10001-ADC)
+Required properties:
+  - compatible: Should be "cosmic,10001-adc"
+  - reg: Should contain adc registers location and length.
+  - clock-names: Should contain "adc".
+  - clocks: Should contain a clock specifier for each entry in clock-names
+  - vref-supply: The regulator supply ADC reference voltage.
+Optional properties:
+  - adc-reserved-channels: Bitmask of reserved channels,
+    i.e. channels that cannot be used by the OS.
+Example:
+adc: adc@18101600 {
+        compatible = "cosmic,10001-adc";
+        reg = <0x18101600 0x24>;
+        adc-reserved-channels = <0x2>;
+        clocks = <&adc_clk>;
+        clock-names = "adc";
+        vref-supply = <&reg_1v8>;
+};
diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt
new file mode 100644
index 000000000000..0fb46137f936
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt
@@ -0,0 +1,129 @@
+Qualcomm's SPMI PMIC voltage ADC
+SPMI PMIC voltage ADC (VADC) provides interface to clients to read
+voltage. The VADC is a 15-bit sigma-delta ADC.
+VADC node:
+- compatible:
+    Usage: required
+    Value type: <string>
+    Definition: Should contain "qcom,spmi-vadc".
+- reg:
+    Usage: required
+    Value type: <prop-encoded-array>
+    Definition: VADC base address and length in the SPMI PMIC register map.
+- #address-cells:
+    Usage: required
+    Value type: <u32>
+    Definition: Must be one. Child node 'reg' property should define ADC
+            channel number.
+- #size-cells:
+    Usage: required
+    Value type: <u32>
+    Definition: Must be zero.
+- #io-channel-cells:
+    Usage: required
+    Value type: <u32>
+    Definition: Must be one. For details about IIO bindings see:
+            Documentation/devicetree/bindings/iio/iio-bindings.txt
+- interrupts:
+    Usage: optional
+    Value type: <prop-encoded-array>
+    Definition: End of conversion interrupt.
+Channel node properties:
+- reg:
+    Usage: required
+    Value type: <u32>
+    Definition: ADC channel number.
+            See include/dt-bindings/iio/qcom,spmi-vadc.h
+- qcom,decimation:
+    Usage: optional
+    Value type: <u32>
+    Definition: This parameter is used to decrease ADC sampling rate.
+            Quicker measurements can be made by reducing decimation ratio.
+            Valid values are 512, 1024, 2048, 4096.
+            If property is not found, default value of 512 will be used.
+- qcom,pre-scaling:
+    Usage: optional
+    Value type: <u32 array>
+    Definition: Used for scaling the channel input signal before the signal is
+            fed to VADC. The configuration for this node is to know the
+            pre-determined ratio and use it for post scaling. Select one from
+            the following options.
+            <1 1>, <1 3>, <1 4>, <1 6>, <1 20>, <1 8>, <10 81>, <1 10>
+            If property is not found default value depending on chip will be used.
+- qcom,ratiometric:
+    Usage: optional
+    Value type: <empty>
+    Definition: Channel calibration type. If this property is specified
+            VADC will use the VDD reference (1.8V) and GND for channel
+            calibration. If property is not found, channel will be
+            calibrated with 0.625V and 1.25V reference channels, also
+            known as absolute calibration.
+- qcom,hw-settle-time:
+    Usage: optional
+    Value type: <u32>
+    Definition: Time between AMUX getting configured and the ADC starting
+            conversion. Delay = 100us * (value) for value < 11, and
+            2ms * (value - 10) otherwise.
+            Valid values are: 0, 100, 200, 300, 400, 500, 600, 700, 800,
+            900 us and 1, 2, 4, 6, 8, 10 ms
+            If property is not found, channel will use 0us.
+- qcom,avg-samples:
+    Usage: optional
+    Value type: <u32>
+    Definition: Number of samples to be used for measurement.
+            Averaging provides the option to obtain a single measurement
+            from the ADC that is an average of multiple samples. The value
+            selected is 2^(value).
+            Valid values are: 1, 2, 4, 8, 16, 32, 64, 128, 256, 512
+            If property is not found, 1 sample will be used.
+NOTE:
+Following channels, also known as reference point channels, are used for
+result calibration and their channel configuration nodes should be defined:
+VADC_REF_625MV and/or VADC_SPARE1(based on PMIC version) VADC_REF_1250MV,
+VADC_GND_REF and VADC_VDD_VADC.
+Example:
+        /* VADC node */
+        pmic_vadc: vadc@3100 {
+                compatible = "qcom,spmi-vadc";
+                reg = <0x3100 0x100>;
+                interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                #io-channel-cells = <1>;
+                io-channel-ranges;
+                /* Channel node */
+                usb_id_nopull {
+                        reg = <VADC_LR_MUX10_USB_ID>;
+                        qcom,decimation = <512>;
+                        qcom,ratiometric;
+                        qcom,hw-settle-time = <200>;
+                        qcom,avg-samples = <1>;
+                        qcom,pre-scaling = <1 3>;
+                };
+        };
+        /* IIO client node */
+        usb {
+                io-channels = <&pmic_vadc VADC_LR_MUX10_USB_ID>;
+                io-channel-names = "vadc";
+        };
diff --git a/Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt b/Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt
index d9ee909d2b78..d71258e2d456 100644
--- a/Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt
@@ -59,7 +59,7 @@ Optional properties:
          Each child node represents one channel and has the following
          properties:
                Required properties:
-                        * reg: Pair of pins the the channel is connected to.
+                        * reg: Pair of pins the channel is connected to.
                                0: VP/VN
                                1: VAUXP[0]/VAUXN[0]
                                2: VAUXP[1]/VAUXN[1]
diff --git a/Documentation/devicetree/bindings/iio/sensorhub.txt b/Documentation/devicetree/bindings/iio/sensorhub.txt
new file mode 100644
index 000000000000..8d57571d5c0b
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/sensorhub.txt
@@ -0,0 +1,25 @@
+Samsung Sensorhub driver
+Sensorhub is a MCU which manages several sensors and also plays the role
+of a virtual sensor device.
+Required properties:
+- compatible: "samsung,sensorhub-rinato" or "samsung,sensorhub-thermostat"
+- spi-max-frequency: max SPI clock frequency
+- interrupt-parent: interrupt parent
+- interrupts: communication interrupt
+- ap-mcu-gpios: [out] ap to sensorhub line - used during communication
+- mcu-ap-gpios: [in] sensorhub to ap - used during communication
+- mcu-reset-gpios: [out] sensorhub reset
+Example:
+        shub_spi: shub {
+                compatible = "samsung,sensorhub-rinato";
+                spi-max-frequency = <5000000>;
+                interrupt-parent = <&gpx0>;
+                interrupts = <2 0>;
+                ap-mcu-gpios = <&gpx0 0 0>;
+                mcu-ap-gpios = <&gpx0 4 0>;
+                mcu-reset-gpios = <&gpx0 5 0>;
+        };
diff --git a/Documentation/devicetree/bindings/input/e3x0-button.txt b/Documentation/devicetree/bindings/input/e3x0-button.txt
new file mode 100644
index 000000000000..751665e8e47a
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/e3x0-button.txt
@@ -0,0 +1,25 @@
+National Instruments Ettus Research USRP E3x0 button driver
+This module is part of the NI Ettus Research USRP E3x0 SDR.
+This module provides a simple power button event via two interrupts.
+Required properties:
+- compatible: should be one of the following
+  - "ettus,e3x0-button": For devices such as the NI Ettus Research USRP E3x0
+- interrupt-parent:
+  - a phandle to the interrupt controller that it is attached to.
+- interrupts: should be one of the following
+  - <0 30 1>, <0 31 1>: For devices such as the NI Ettus Research USRP E3x0
+- interrupt-names: should be one of the following
+  - "press", "release": For devices such as the NI Ettus Research USRP E3x0
+Note: Interrupt numbers might vary depending on the FPGA configuration.
+Example:
+        button {
+                compatible = "ettus,e3x0-button";
+                interrupt-parent = <&intc>;
+                interrupts = <0 30 1>, <0 31 1>;
+                interrupt-names = "press", "release";
+        }
diff --git a/Documentation/devicetree/bindings/input/regulator-haptic.txt b/Documentation/devicetree/bindings/input/regulator-haptic.txt
new file mode 100644
index 000000000000..3ed1c7eb2f97
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/regulator-haptic.txt
@@ -0,0 +1,21 @@
+* Regulator Haptic Device Tree Bindings
+Required Properties:
+ - compatible : Should be "regulator-haptic"
+ - haptic-supply : Power supply to the haptic motor.
+        [*] refer Documentation/devicetree/bindings/regulator/regulator.txt
+ - max-microvolt : The maximum voltage value supplied to the haptic motor.
+                [The unit of the voltage is a micro]
+ - min-microvolt : The minimum voltage value supplied to the haptic motor.
+                [The unit of the voltage is a micro]
+Example:
+        haptics {
+                compatible = "regulator-haptic";
+                haptic-supply = <&motor_regulator>;
+                max-microvolt = <2700000>;
+                min-microvolt = <1100000>;
+        };
diff --git a/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
new file mode 100644
index 000000000000..b9c32f6fd687
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
@@ -0,0 +1,62 @@
+Allwinner sun4i low res adc attached tablet keys
+------------------------------------------------
+Required properties:
+ - compatible: "allwinner,sun4i-a10-lradc-keys"
+ - reg: mmio address range of the chip
+ - interrupts: interrupt to which the chip is connected
+ - vref-supply: powersupply for the lradc reference voltage
+Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys":
+Required subnode-properties:
+        - label: Descriptive name of the key.
+        - linux,code: Keycode to emit.
+        - channel: Channel this key is attached to, mut be 0 or 1.
+        - voltage: Voltage in µV at lradc input when this key is pressed.
+Example:
+#include <dt-bindings/input/input.h>
+        lradc: lradc@01c22800 {
+                compatible = "allwinner,sun4i-a10-lradc-keys";
+                reg = <0x01c22800 0x100>;
+                interrupts = <31>;
+                vref-supply = <&reg_vcc3v0>;
+                button@191 {
+                        label = "Volume Up";
+                        linux,code = <KEY_VOLUMEUP>;
+                        channel = <0>;
+                        voltage = <191274>;
+                };
+                button@392 {
+                        label = "Volume Down";
+                        linux,code = <KEY_VOLUMEDOWN>;
+                        channel = <0>;
+                        voltage = <392644>;
+                };
+                button@601 {
+                        label = "Menu";
+                        linux,code = <KEY_MENU>;
+                        channel = <0>;
+                        voltage = <601151>;
+                };
+                button@795 {
+                        label = "Enter";
+                        linux,code = <KEY_ENTER>;
+                        channel = <0>;
+                        voltage = <795090>;
+                };
+                button@987 {
+                        label = "Home";
+                        linux,code = <KEY_HOMEPAGE>;
+                        channel = <0>;
+                        voltage = <987387>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
index aef57791f40b..433332d3b2ba 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
@@ -2,9 +2,10 @@ sun4i resistive touchscreen controller
 --------------------------------------
 Required properties:
- - compatible: "allwinner,sun4i-a10-ts"
+ - compatible: "allwinner,sun4i-a10-ts" or "allwinner,sun6i-a31-ts"
 - reg: mmio address range of the chip
 - interrupts: interrupt to which the chip is connected
+ - #thermal-sensor-cells: shall be 0
 Optional properties:
 - allwinner,ts-attached: boolean indicating that an actual touchscreen is
@@ -17,4 +18,5 @@ Example:
                reg = <0x01c25000 0x100>;
                interrupts = <29>;
                allwinner,ts-attached;
+                #thermal-sensor-cells = <0>;
        };
diff --git a/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt b/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
index 878549ba814d..6c4fb34823d3 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
@@ -28,6 +28,20 @@ Required properties:
        ti,adc-channels: List of analog inputs available for ADC.
                         AIN0 = 0, AIN1 = 1 and so on till AIN7 = 7.
+Optional properties:
+- child "tsc"
+        ti,charge-delay: Length of touch screen charge delay step in terms of
+                         ADC clock cycles. Charge delay value should be large
+                         in order to avoid false pen-up events. This value
+                         effects the overall sampling speed, hence need to be
+                         kept as low as possible, while avoiding false pen-up
+                         event. Start from a lower value, say 0x400, and
+                         increase value until false pen-up events are avoided.
+                         The pen-up detection happens immediately after the
+                         charge step, so this does in fact function as a
+                         hardware knob for adjusting the amount of "settling
+                         time".
 Example:
        tscadc: tscadc@44e0d000 {
                compatible = "ti,am3359-tscadc";
@@ -36,6 +50,7 @@ Example:
                        ti,x-plate-resistance = <200>;
                        ti,coordiante-readouts = <5>;
                        ti,wire-config = <0x00 0x11 0x22 0x33>;
+                        ti,charge-delay = <0x400>;
                };
                adc {
diff --git a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
new file mode 100644
index 000000000000..e30e0b93f2b3
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
@@ -0,0 +1,17 @@
+Texas Instruments TPS65218 power button
+This driver provides a simple power button event via an Interrupt.
+Required properties:
+- compatible: should be "ti,tps65218-pwrbutton"
+- interrupts: should be one of the following
+   - <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218
+Example:
+&tps {
+        power-button {
+                compatible = "ti,tps65218-pwrbutton";
+                interrupts = <3 IRQ_TYPE_EDGE_BOTH>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/interrupt-controller/digicolor-ic.txt b/Documentation/devicetree/bindings/interrupt-controller/digicolor-ic.txt
new file mode 100644
index 000000000000..42d41ec84c7b
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/digicolor-ic.txt
@@ -0,0 +1,21 @@
+Conexant Digicolor Interrupt Controller
+Required properties:
+- compatible : should be "cnxt,cx92755-ic"
+- reg : Specifies base physical address and size of the interrupt controller
+  registers (IC) area
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode an
+  interrupt source. The value shall be 1.
+- syscon: A phandle to the syscon node describing UC registers
+Example:
+        intc: interrupt-controller@f0000040 {
+                compatible = "cnxt,cx92755-ic";
+                interrupt-controller;
+                #interrupt-cells = <1>;
+                reg = <0xf0000040 0x40>;
+                syscon = <&uc_regs>;
+        };
diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
index c73acd060093..4f7946ae8adc 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
@@ -9,6 +9,11 @@ Required properties:
    - "renesas,intc-irqpin-r8a7778" (R-Car M1A)
    - "renesas,intc-irqpin-r8a7779" (R-Car H1)
    - "renesas,intc-irqpin-sh73a0" (SH-Mobile AG5)
+- reg: Base address and length of each register bank used by the external
+  IRQ pins driven by the interrupt controller hardware module. The base
+  addresses, length and number of required register banks varies with soctype.
 - #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
  interrupts.txt in this directory
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
new file mode 100644
index 000000000000..38ce5d037722
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
@@ -0,0 +1,28 @@
+Omap2/3 intc controller
+On TI omap2 and 3 the intc interrupt controller can provide
+96 or 128 IRQ signals to the ARM host depending on the SoC.
+Required Properties:
+- compatible: should be one of
+                        "ti,omap2-intc"
+                        "ti,omap3-intc"
+                        "ti,dm814-intc"
+                        "ti,dm816-intc"
+                        "ti,am33xx-intc"
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode interrupt
+                     source, should be 1 for intc
+- interrupts: interrupt reference to primary interrupt controller
+Please refer to interrupts.txt in this directory for details of the common
+Interrupt Controllers bindings used by client devices.
+Example:
+        intc: interrupt-controller@48200000 {
+                compatible = "ti,omap3-intc";
+                interrupt-controller;
+                #interrupt-cells = <1>;
+                reg = <0x48200000 0x1000>;
+        };
diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt
new file mode 100644
index 000000000000..cd29083e16ec
--- /dev/null
+++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt
@@ -0,0 +1,41 @@
+* Renesas VMSA-Compatible IOMMU
+The IPMMU is an IOMMU implementation compatible with the ARM VMSA page tables.
+It provides address translation for bus masters outside of the CPU, each
+connected to the IPMMU through a port called micro-TLB.
+Required Properties:
+  - compatible: Must contain "renesas,ipmmu-vmsa".
+  - reg: Base address and size of the IPMMU registers.
+  - interrupts: Specifiers for the MMU fault interrupts. For instances that
+    support secure mode two interrupts must be specified, for non-secure and
+    secure mode, in that order. For instances that don't support secure mode a
+    single interrupt must be specified.
+  - #iommu-cells: Must be 1.
+Each bus master connected to an IPMMU must reference the IPMMU in its device
+node with the following property:
+  - iommus: A reference to the IPMMU in two cells. The first cell is a phandle
+    to the IPMMU and the second cell the number of the micro-TLB that the
+    device is connected to.
+Example: R8A7791 IPMMU-MX and VSP1-D0 bus master
+        ipmmu_mx: mmu@fe951000 {
+                compatible = "renasas,ipmmu-vmsa";
+                reg = <0 0xfe951000 0 0x1000>;
+                interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 221 IRQ_TYPE_LEVEL_HIGH>;
+                #iommu-cells = <1>;
+        };
+        vsp1@fe928000 {
+                ...
+                iommus = <&ipmmu_mx 13>;
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt b/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
index 6fa4c737af23..729543c47046 100644
--- a/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
+++ b/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
@@ -45,7 +45,7 @@ Required properties:
               Exynos4 SoCs, there needs no "master" clock.
               Exynos5 SoCs, some System MMUs must have "master" clocks.
 - clocks: Required if the System MMU is needed to gate its clock.
- samsung,power-domain: Required if the System MMU is needed to gate its power.
+- power-domains: Required if the System MMU is needed to gate its power.
          Please refer to the following document:
          Documentation/devicetree/bindings/arm/exynos/power_domain.txt
@@ -54,7 +54,7 @@ Examples:
                compatible = "samsung,exynos5-gsc";
                reg = <0x13e00000 0x1000>;
                interrupts = <0 85 0>;
-                samsung,power-domain = <&pd_gsc>;
+                power-domains = <&pd_gsc>;
                clocks = <&clock CLK_GSCL0>;
                clock-names = "gscl";
        };
@@ -66,5 +66,5 @@ Examples:
                interrupts = <2 0>;
                clock-names = "sysmmu", "master";
                clocks = <&clock CLK_SMMU_GSCL0>, <&clock CLK_GSCL0>;
-                samsung,power-domain = <&pd_gsc>;
+                power-domains = <&pd_gsc>;
        };
diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt
index 2d88816dd550..34811c57db69 100644
--- a/Documentation/devicetree/bindings/leds/common.txt
+++ b/Documentation/devicetree/bindings/leds/common.txt
@@ -1,6 +1,19 @@
 Common leds properties.
+LED and flash LED devices provide the same basic functionality as current
+regulators, but extended with LED and flash LED specific features like
+blinking patterns, flash timeout, flash faults and external flash strobe mode.
+Many LED devices expose more than one current output that can be connected
+to one or more discrete LED component. Since the arrangement of connections
+can influence the way of the LED device initialization, the LED components
+have to be tightly coupled with the LED device binding. They are represented
+by child nodes of the parent LED device binding.
 Optional properties for child nodes:
+- led-sources : List of device current outputs the LED is connected to. The
+                outputs are identified by the numbers that must be defined
+                in the LED device binding documentation.
 - label : The label for this LED.  If omitted, the label is
  taken from the node name (excluding the unit address).
@@ -14,6 +27,15 @@ Optional properties for child nodes:
     "ide-disk" - LED indicates disk activity
     "timer" - LED flashes at a fixed, configurable rate
+- max-microamp : maximum intensity in microamperes of the LED
+                 (torch LED for flash devices)
+- flash-max-microamp : maximum intensity in microamperes of the
+                       flash LED; it is mandatory if the LED should
+                       support the flash mode
+- flash-timeout-us : timeout in microseconds after which the flash
+                     LED is turned off
 Examples:
 system-status {
@@ -21,3 +43,11 @@ system-status {
        linux,default-trigger = "heartbeat";
        ...
 };
+camera-flash {
+        label = "Flash";
+        led-sources = <0>, <1>;
+        max-microamp = <50000>;
+        flash-max-microamp = <320000>;
+        flash-timeout-us = <500000>;
+};
diff --git a/Documentation/devicetree/bindings/mailbox/altera-mailbox.txt b/Documentation/devicetree/bindings/mailbox/altera-mailbox.txt
new file mode 100644
index 000000000000..c2619797ce0c
--- /dev/null
+++ b/Documentation/devicetree/bindings/mailbox/altera-mailbox.txt
@@ -0,0 +1,49 @@
+Altera Mailbox Driver
+=====================
+Required properties:
+- compatible :  "altr,mailbox-1.0".
+- reg :         physical base address of the mailbox and length of
+                memory mapped region.
+- #mbox-cells:  Common mailbox binding property to identify the number
+                of cells required for the mailbox specifier. Should be 1.
+Optional properties:
+- interrupt-parent :    interrupt source phandle.
+- interrupts :          interrupt number. The interrupt specifier format
+                        depends on the interrupt controller parent.
+Example:
+        mbox_tx: mailbox@0x100 {
+                compatible = "altr,mailbox-1.0";
+                reg = <0x100 0x8>;
+                interrupt-parent = < &gic_0 >;
+                interrupts = <5>;
+                #mbox-cells = <1>;
+        };
+        mbox_rx: mailbox@0x200 {
+                compatible = "altr,mailbox-1.0";
+                reg = <0x200 0x8>;
+                interrupt-parent = < &gic_0 >;
+                interrupts = <6>;
+                #mbox-cells = <1>;
+        };
+Mailbox client
+===============
+"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 second argument is the channel index. It must be 0 (hardware
+support only one channel).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:
+        mclient0: mclient0@0x400 {
+                compatible = "client-1.0";
+                reg = <0x400 0x10>;
+                mbox-names = "mbox-tx", "mbox-rx";
+                mboxes = <&mbox_tx 0>,
+                         <&mbox_rx 0>;
+        };
diff --git a/Documentation/devicetree/bindings/media/atmel-isi.txt b/Documentation/devicetree/bindings/media/atmel-isi.txt
index 17e71b7b44c6..251f008f220c 100644
--- a/Documentation/devicetree/bindings/media/atmel-isi.txt
+++ b/Documentation/devicetree/bindings/media/atmel-isi.txt
@@ -38,7 +38,7 @@ Example:
        i2c1: i2c@f0018000 {
                ov2640: camera@0x30 {
-                        compatible = "omnivision,ov2640";
+                        compatible = "ovti,ov2640";
                        reg = <0x30>;
                        port {
diff --git a/Documentation/devicetree/bindings/media/i2c/nokia,smia.txt b/Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
new file mode 100644
index 000000000000..855e1faf73e2
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
@@ -0,0 +1,63 @@
+SMIA/SMIA++ sensor
+SMIA (Standard Mobile Imaging Architecture) is an image sensor standard
+defined jointly by Nokia and ST. SMIA++, defined by Nokia, is an extension
+of that. These definitions are valid for both types of sensors.
+More detailed documentation can be found in
+Documentation/devicetree/bindings/media/video-interfaces.txt .
+Mandatory properties
+--------------------
+- compatible: "nokia,smia"
+- reg: I2C address (0x10, or an alternative address)
+- vana-supply: Analogue voltage supply (VANA), typically 2,8 volts (sensor
+  dependent).
+- clocks: External clock to the sensor
+- clock-frequency: Frequency of the external clock to the sensor
+- link-frequencies: List of allowed data link frequencies. An array of
+  64-bit elements.
+Optional properties
+-------------------
+- nokia,nvm-size: The size of the NVM, in bytes. If the size is not given,
+  the NVM contents will not be read.
+- reset-gpios: XSHUTDOWN GPIO
+Endpoint node mandatory properties
+----------------------------------
+- clock-lanes: <0>
+- data-lanes: <1..n>
+- remote-endpoint: A phandle to the bus receiver's endpoint node.
+Example
+-------
+&i2c2 {
+        clock-frequency = <400000>;
+        smiapp_1: camera@10 {
+                compatible = "nokia,smia";
+                reg = <0x10>;
+                reset-gpios = <&gpio3 20 0>;
+                vana-supply = <&vaux3>;
+                clocks = <&omap3_isp 0>;
+                clock-frequency = <9600000>;
+                nokia,nvm-size = <512>; /* 8 * 64 */
+                link-frequencies = /bits/ 64 <199200000 210000000 499200000>;
+                port {
+                        smiapp_1_1: endpoint {
+                                clock-lanes = <0>;
+                                data-lanes = <1 2>;
+                                remote-endpoint = <&csi2a_ep>;
+                        };
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index 3e3c5f349570..2d5787eac91a 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -28,7 +28,7 @@ Required properties:
                    for DMA contiguous memory allocation and its size.
 Optional properties:
-  - samsung,power-domain : power-domain property defined with a phandle
+  - power-domains : power-domain property defined with a phandle
                           to respective power domain.
 Example:
@@ -38,7 +38,7 @@ mfc: codec@13400000 {
        compatible = "samsung,mfc-v5";
        reg = <0x13400000 0x10000>;
        interrupts = <0 94 0>;
-        samsung,power-domain = <&pd_mfc>;
+        power-domains = <&pd_mfc>;
        clocks = <&clock 273>;
        clock-names = "mfc";
 };
diff --git a/Documentation/devicetree/bindings/media/sunxi-ir.txt b/Documentation/devicetree/bindings/media/sunxi-ir.txt
index 23dd5ad07b7c..1811a067c72c 100644
--- a/Documentation/devicetree/bindings/media/sunxi-ir.txt
+++ b/Documentation/devicetree/bindings/media/sunxi-ir.txt
@@ -1,7 +1,7 @@
 Device-Tree bindings for SUNXI IR controller found in sunXi SoC family
 Required properties:
- compatible        : should be "allwinner,sun4i-a10-ir";
+- compatible        : "allwinner,sun4i-a10-ir" or "allwinner,sun5i-a13-ir"
 - clocks            : list of clock specifiers, corresponding to
                      entries in clock-names property;
 - clock-names       : should contain "apb" and "ir" entries;
@@ -10,6 +10,7 @@ Required properties:
 Optional properties:
 - linux,rc-map-name : Remote control map name.
+- resets : phandle + reset specifier pair
 Example:
@@ -17,6 +18,7 @@ ir0: ir@01c21800 {
        compatible = "allwinner,sun4i-a10-ir";
        clocks = <&apb0_gates 6>, <&ir0_clk>;
        clock-names = "apb", "ir";
+        resets = <&apb0_rst 1>;
        interrupts = <0 5 1>;
        reg = <0x01C21800 0x40>;
        linux,rc-map-name = "rc-rc6-mce";
diff --git a/Documentation/devicetree/bindings/media/ti-am437x-vpfe.txt b/Documentation/devicetree/bindings/media/ti-am437x-vpfe.txt
new file mode 100644
index 000000000000..3932e766553a
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/ti-am437x-vpfe.txt
@@ -0,0 +1,61 @@
+Texas Instruments AM437x CAMERA (VPFE)
+--------------------------------------
+The Video Processing Front End (VPFE) is a key component for image capture
+applications. The capture module provides the system interface and the
+processing capability to connect RAW image-sensor modules and video decoders
+to the AM437x device.
+Required properties:
+- compatible: must be "ti,am437x-vpfe"
+- reg: physical base address and length of the registers set for the device;
+- interrupts: should contain IRQ line for the VPFE;
+- ti,am437x-vpfe-interface: can be one of the following,
+        0 - Raw Bayer Interface.
+        1 - 8 Bit BT656 Interface.
+        2 - 10 Bit BT656 Interface.
+        3 - YCbCr 8 Bit Interface.
+        4 - YCbCr 16 Bit Interface.
+VPFE supports a single port node with parallel bus. It should contain one
+'port' child node with child 'endpoint' node. Please refer to the bindings
+defined in Documentation/devicetree/bindings/media/video-interfaces.txt.
+Example:
+        vpfe: vpfe@f0034000 {
+                compatible = "ti,am437x-vpfe";
+                reg = <0x48328000 0x2000>;
+                interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+                pinctrl-names = "default", "sleep";
+                pinctrl-0 = <&vpfe_pins_default>;
+                pinctrl-1 = <&vpfe_pins_sleep>;
+                port {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        vpfe0_ep: endpoint {
+                                remote-endpoint = <&ov2659_1>;
+                                ti,am437x-vpfe-interface = <0>;
+                                bus-width = <8>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                        };
+                };
+        };
+        i2c1: i2c@4802a000 {
+                ov2659@30 {
+                        compatible = "ti,ov2659";
+                        reg = <0x30>;
+                        port {
+                                ov2659_1: endpoint {
+                                        remote-endpoint = <&vpfe0_ep>;
+                                        bus-width = <8>;
+                                        mclk-frequency = <12000000>;
+                                };
+                        };
+        };
diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt b/Documentation/devicetree/bindings/media/video-interfaces.txt
index ce719f89dd1c..571b4c60665f 100644
--- a/Documentation/devicetree/bindings/media/video-interfaces.txt
+++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
@@ -103,6 +103,9 @@ Optional endpoint properties
  array contains only one entry.
 - clock-noncontinuous: a boolean property to allow MIPI CSI-2 non-continuous
  clock mode.
+- link-frequencies: Allowed data bus frequencies. For MIPI CSI-2, for
+  instance, this is the actual frequency of the bus, not bits per clock per
+  lane value. An array of 64-bit unsigned integers.
 Example
@@ -159,7 +162,7 @@ pipelines can be active: ov772x -> ceu0 or imx074 -> csi2 -> ceu0.
        i2c0: i2c@0xfff20000 {
                ...
                ov772x_1: camera@0x21 {
-                        compatible = "omnivision,ov772x";
+                        compatible = "ovti,ov772x";
                        reg = <0x21>;
                        vddio-supply = <&regulator1>;
                        vddcore-supply = <&regulator2>;
diff --git a/Documentation/devicetree/bindings/memory-controllers/renesas-memory-controllers.txt b/Documentation/devicetree/bindings/memory-controllers/renesas-memory-controllers.txt
new file mode 100644
index 000000000000..c64b7925cd09
--- /dev/null
+++ b/Documentation/devicetree/bindings/memory-controllers/renesas-memory-controllers.txt
@@ -0,0 +1,44 @@
+DT bindings for Renesas R-Mobile and SH-Mobile memory controllers
+=================================================================
+Renesas R-Mobile and SH-Mobile SoCs contain one or more memory controllers.
+These memory controllers differ from one SoC variant to another, and are called
+by different names ("DDR Bus Controller (DBSC)", "DDR3 Bus State Controller
+(DBSC3)", "SDRAM Bus State Controller (SBSC)").
+Currently memory controller device nodes are used only to reference PM
+domains, and prevent these PM domains from being powered down, which would
+crash the system.
+As there exist no actual drivers for these controllers yet, these bindings
+should be considered EXPERIMENTAL for now.
+Required properties:
+  - compatible: Must be one of the following SoC-specific values:
+                  - "renesas,dbsc-r8a73a4" (R-Mobile APE6)
+                  - "renesas,dbsc3-r8a7740" (R-Mobile A1)
+                  - "renesas,sbsc-sh73a0" (SH-Mobile AG5)
+  - reg: Must contain the base address and length of the memory controller's
+         registers.
+Optional properties:
+  - interrupts: Must contain a list of interrupt specifiers for memory
+                controller interrupts, if available.
+  - interrupts-names: Must contain a list of interrupt names corresponding to
+                      the interrupts in the interrupts property, if available.
+                      Valid interrupt names are:
+                        - "sec" (secure interrupt)
+                        - "temp" (normal (temperature) interrupt)
+  - power-domains: Must contain a reference to the PM domain that the memory
+                   controller belongs to, if available.
+Example:
+        sbsc1: memory-controller@fe400000 {
+                compatible = "renesas,sbsc-sh73a0";
+                reg = <0xfe400000 0x400>;
+                interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 36 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "sec", "temp";
+                power-domains = <&pd_a4bc0>;
+        };
diff --git a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt
new file mode 100644
index 000000000000..e3ef50ca02a5
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt
@@ -0,0 +1,24 @@
+* Device tree bindings for Atmel Bus Matrix
+The Bus Matrix registers are used to configure Atmel SoCs internal bus
+behavior (master/slave priorities, undefined burst length type, ...)
+Required properties:
+- compatible:           Should be one of the following
+                        "atmel,at91sam9260-matrix", "syscon"
+                        "atmel,at91sam9261-matrix", "syscon"
+                        "atmel,at91sam9263-matrix", "syscon"
+                        "atmel,at91sam9rl-matrix", "syscon"
+                        "atmel,at91sam9g45-matrix", "syscon"
+                        "atmel,at91sam9n12-matrix", "syscon"
+                        "atmel,at91sam9x5-matrix", "syscon"
+                        "atmel,sama5d3-matrix", "syscon"
+- reg:                  Contains offset/length value of the Bus Matrix
+                        memory region.
+Example:
+matrix: matrix@ffffec00 {
+        compatible = "atmel,sama5d3-matrix", "syscon";
+        reg = <0xffffec00 0x200>;
+};
diff --git a/Documentation/devicetree/bindings/mfd/atmel-smc.txt b/Documentation/devicetree/bindings/mfd/atmel-smc.txt
new file mode 100644
index 000000000000..26eeed373934
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/atmel-smc.txt
@@ -0,0 +1,19 @@
+* Device tree bindings for Atmel SMC (Static Memory Controller)
+The SMC registers are used to configure Atmel EBI (External Bus Interface)
+to interface with standard memory devices (NAND, NOR, SRAM or specialized
+devices like FPGAs).
+Required properties:
+- compatible:           Should be one of the following
+                        "atmel,at91sam9260-smc", "syscon"
+                        "atmel,sama5d3-smc", "syscon"
+- reg:                  Contains offset/length value of the SMC memory
+                        region.
+Example:
+smc: smc@ffffc000 {
+        compatible = "atmel,sama5d3-smc", "syscon";
+        reg = <0xffffc000 0x1000>;
+};
diff --git a/Documentation/devicetree/bindings/mfd/da9063.txt b/Documentation/devicetree/bindings/mfd/da9063.txt
new file mode 100644
index 000000000000..42c6fa6f1c9a
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/da9063.txt
@@ -0,0 +1,93 @@
+* Dialog DA9063 Power Management Integrated Circuit (PMIC)
+DA9093 consists of a large and varied group of sub-devices (I2C Only):
+Device                   Supply Names    Description
+------                   ------------    -----------
+da9063-regulator        :               : LDOs & BUCKs
+da9063-rtc              :               : Real-Time Clock
+da9063-watchdog         :               : Watchdog
+======
+Required properties:
+- compatible : Should be "dlg,da9063"
+- reg : Specifies the I2C slave address (this defaults to 0x58 but it can be
+  modified to match the chip's OTP settings).
+- interrupt-parent : Specifies the reference to the interrupt controller for
+  the DA9063.
+- interrupts : IRQ line information.
+- interrupt-controller
+Sub-nodes:
+- regulators : This node defines the settings for the LDOs and BUCKs. The
+  DA9063 regulators are bound using their names listed below:
+    bcore1    : BUCK CORE1
+    bcore2    : BUCK CORE2
+    bpro      : BUCK PRO
+    bmem      : BUCK MEM
+    bio       : BUCK IO
+    bperi     : BUCK PERI
+    ldo1      : LDO_1
+    ldo2      : LDO_2
+    ldo3      : LDO_3
+    ldo4      : LDO_4
+    ldo5      : LDO_5
+    ldo6      : LDO_6
+    ldo7      : LDO_7
+    ldo8      : LDO_8
+    ldo9      : LDO_9
+    ldo10     : LDO_10
+    ldo11     : LDO_11
+  The component follows the standard regulator framework and the bindings
+  details of individual regulator device can be found in:
+  Documentation/devicetree/bindings/regulator/regulator.txt
+- rtc : This node defines settings for the Real-Time Clock associated with
+  the DA9063. There are currently no entries in this binding, however
+  compatible = "dlg,da9063-rtc" should be added if a node is created.
+- watchdog : This node defines settings for the Watchdog timer associated
+  with the DA9063. There are currently no entries in this binding, however
+  compatible = "dlg,da9063-watchdog" should be added if a node is created.
+Example:
+        pmic0: da9063@58 {
+                compatible = "dlg,da9063"
+                reg = <0x58>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+                interrupt-controller;
+                rtc {
+                        compatible = "dlg,da9063-rtc";
+                };
+                wdt {
+                        compatible = "dlg,da9063-watchdog";
+                };
+                regulators {
+                        DA9063_BCORE1: bcore1 {
+                                regulator-name = "BCORE1";
+                                regulator-min-microvolt = <300000>;
+                                regulator-max-microvolt = <1570000>;
+                                regulator-min-microamp = <500000>;
+                                regulator-max-microamp = <2000000>;
+                                regulator-boot-on;
+                        };
+                        DA9063_LDO11: ldo11 {
+                                regulator-name = "LDO_11";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <3600000>;
+                                regulator-boot-on;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/mfd/max77686.txt b/Documentation/devicetree/bindings/mfd/max77686.txt
index 75fdfaf41831..e39f0bc1f55e 100644
--- a/Documentation/devicetree/bindings/mfd/max77686.txt
+++ b/Documentation/devicetree/bindings/mfd/max77686.txt
@@ -39,6 +39,12 @@ to get matched with their hardware counterparts as follow:
        -BUCKn  :       1-4.
  Use standard regulator bindings for it ('regulator-off-in-suspend').
+  LDO20, LDO21, LDO22, BUCK8 and BUCK9 can be configured to GPIO enable
+  control. To turn this feature on this property must be added to the regulator
+  sub-node:
+        - maxim,ena-gpios :     one GPIO specifier enable control (the gpio
+                                flags are actually ignored and always
+                                ACTIVE_HIGH is used)
 Example:
@@ -65,4 +71,12 @@ Example:
                                regulator-always-on;
                                regulator-boot-on;
                        };
+                        buck9_reg {
+                                regulator-compatible = "BUCK9";
+                                regulator-name = "CAM_ISP_CORE_1.2V";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1200000>;
+                                maxim,ena-gpios = <&gpm0 3 GPIO_ACTIVE_HIGH>;
+                        };
        }
diff --git a/Documentation/devicetree/bindings/mfd/max77693.txt b/Documentation/devicetree/bindings/mfd/max77693.txt
index 01e9f30fe678..38e64405e98d 100644
--- a/Documentation/devicetree/bindings/mfd/max77693.txt
+++ b/Documentation/devicetree/bindings/mfd/max77693.txt
@@ -41,6 +41,41 @@ Optional properties:
         To get more informations, please refer to documentaion.
        [*] refer Documentation/devicetree/bindings/pwm/pwm.txt
+- charger : Node configuring the charger driver.
+  If present, required properties:
+  - compatible : Must be "maxim,max77693-charger".
+  Optional properties (if not set, defaults will be used):
+  - maxim,constant-microvolt : Battery constant voltage in uV. The charger
+    will operate in fast charge constant current mode till battery voltage
+    reaches this level. Then the charger will switch to fast charge constant
+    voltage mode. Also vsys (system voltage) will be set to this value when
+    DC power is supplied but charger is not enabled.
+    Valid values: 3650000 - 4400000, step by 25000 (rounded down)
+    Default: 4200000
+  - maxim,min-system-microvolt : Minimal system voltage in uV.
+    Valid values: 3000000 - 3700000, step by 100000 (rounded down)
+    Default: 3600000
+  - maxim,thermal-regulation-celsius : Temperature in Celsius for entering
+    high temperature charging mode. If die temperature exceeds this value
+    the charging current will be reduced by 105 mA/Celsius.
+    Valid values: 70, 85, 100, 115
+    Default: 100
+  - maxim,battery-overcurrent-microamp : Overcurrent protection threshold
+    in uA (current from battery to system).
+    Valid values: 2000000 - 3500000, step by 250000 (rounded down)
+    Default: 3500000
+  - maxim,charge-input-threshold-microvolt : Threshold voltage in uV for
+    triggering input voltage regulation loop. If input voltage decreases
+    below this value, the input current will be reduced to reach the
+    threshold voltage.
+    Valid values: 4300000, 4700000, 4800000, 4900000
+    Default: 4300000
 Example:
        max77693@66 {
                compatible = "maxim,max77693";
@@ -73,4 +108,14 @@ Example:
                        pwms = <&pwm 0 40000 0>;
                        pwm-names = "haptic";
                };
+                charger {
+                        compatible = "maxim,max77693-charger";
+                        maxim,constant-microvolt = <4200000>;
+                        maxim,min-system-microvolt = <3600000>;
+                        maxim,thermal-regulation-celsius = <75>;
+                        maxim,battery-overcurrent-microamp = <3000000>;
+                        maxim,charge-input-threshold-microvolt = <4300000>;
+                };
        };
diff --git a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt
new file mode 100644
index 000000000000..85e31980017a
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt
@@ -0,0 +1,70 @@
+Qualcomm Resource Power Manager (RPM)
+This driver is used to interface with the Resource Power Manager (RPM) found in
+various Qualcomm platforms. The RPM allows each component in the system to vote
+for state of the system resources, such as clocks, regulators and bus
+frequencies.
+- compatible:
+        Usage: required
+        Value type: <string>
+        Definition: must be one of:
+                    "qcom,rpm-apq8064"
+                    "qcom,rpm-msm8660"
+                    "qcom,rpm-msm8960"
+- reg:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: base address and size of the RPM's message ram
+- interrupts:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: three entries specifying the RPM's:
+                    1. acknowledgement interrupt
+                    2. error interrupt
+                    3. wakeup interrupt
+- interrupt-names:
+        Usage: required
+        Value type: <string-array>
+        Definition: must be the three strings "ack", "err" and "wakeup", in order
+- #address-cells:
+        Usage: required
+        Value type: <u32>
+        Definition: must be 1
+- #size-cells:
+        Usage: required
+        Value type: <u32>
+        Definition: must be 0
+- qcom,ipc:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: three entries specifying the outgoing ipc bit used for
+                    signaling the RPM:
+                    - phandle to a syscon node representing the apcs registers
+                    - u32 representing offset to the register within the syscon
+                    - u32 representing the ipc bit within the register
+= EXAMPLE
+        #include <dt-bindings/mfd/qcom-rpm.h>
+        rpm@108000 {
+                compatible = "qcom,rpm-msm8960";
+                reg = <0x108000 0x1000>;
+                qcom,ipc = <&apcs 0x8 2>;
+                interrupts = <0 19 0>, <0 21 0>, <0 22 0>;
+                interrupt-names = "ack", "err", "wakeup";
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
diff --git a/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt b/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
new file mode 100644
index 000000000000..c7a26ca8da12
--- /dev/null
+++ b/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
@@ -0,0 +1,40 @@
+* Freescale Management Complex
+The Freescale Management Complex (fsl-mc) is a hardware resource
+manager that manages specialized hardware objects used in
+network-oriented packet processing applications. After the fsl-mc
+block is enabled, pools of hardware resources are available, such as
+queues, buffer pools, I/O interfaces. These resources are building
+blocks that can be used to create functional hardware objects/devices
+such as network interfaces, crypto accelerator instances, L2 switches,
+etc.
+Required properties:
+    - compatible
+        Value type: <string>
+        Definition: Must be "fsl,qoriq-mc".  A Freescale Management Complex
+                    compatible with this binding must have Block Revision
+                    Registers BRR1 and BRR2 at offset 0x0BF8 and 0x0BFC in
+                    the MC control register region.
+    - reg
+        Value type: <prop-encoded-array>
+        Definition: A standard property.  Specifies one or two regions
+                    defining the MC's registers:
+                       -the first region is the command portal for the
+                        this machine and must always be present
+                       -the second region is the MC control registers. This
+                        region may not be present in some scenarios, such
+                        as in the device tree presented to a virtual machine.
+Example:
+        fsl_mc: fsl-mc@80c000000 {
+                compatible = "fsl,qoriq-mc";
+                reg = <0x00000008 0x0c000000 0 0x40>,    /* MC portal base */
+                      <0x00000000 0x08340000 0 0x40000>; /* MC control reg */
+        };
diff --git a/Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt b/Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt
index b97b8bef1fe5..47b205cc9cc7 100644
--- a/Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt
+++ b/Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt
@@ -1,11 +1,10 @@
 NVIDIA Tegra20/Tegra30/Tegr114/Tegra124 apbmisc block
 Required properties:
- compatible : should be:
+- compatible : For Tegra20, must be "nvidia,tegra20-apbmisc".  For Tegra30,
-       "nvidia,tegra20-apbmisc"
+  must be "nvidia,tegra30-apbmisc".  Otherwise, must contain
-       "nvidia,tegra30-apbmisc"
+  "nvidia,<chip>-apbmisc", plus one of the above, where <chip> is tegra114,
-       "nvidia,tegra114-apbmisc"
+  tegra124, tegra132.
-       "nvidia,tegra124-apbmisc"
 - reg: Should contain 2 entries: the first entry gives the physical address
       and length of the registers which contain revision and debug features.
       The second entry gives the physical address and length of the
diff --git a/Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.txt b/Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.txt
new file mode 100644
index 000000000000..0cb827bf9435
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.txt
@@ -0,0 +1,25 @@
+* The simple eMMC hardware reset provider
+The purpose of this driver is to perform standard eMMC hw reset
+procedure, as descibed by Jedec 4.4 specification. This procedure is
+performed just after MMC core enabled power to the given mmc host (to
+fix possible issues if bootloader has left eMMC card in initialized or
+unknown state), and before performing complete system reboot (also in
+case of emergency reboot call). The latter is needed on boards, which
+doesn't have hardware reset logic connected to emmc card and (limited or
+broken) ROM bootloaders are unable to read second stage from the emmc
+card if the card is left in unknown or already initialized state.
+Required properties:
+- compatible : contains "mmc-pwrseq-emmc".
+- reset-gpios : contains a GPIO specifier. The reset GPIO is asserted
+        and then deasserted to perform eMMC card reset. To perform
+        reset procedure as described in Jedec 4.4 specification, the
+        gpio line should be defined as GPIO_ACTIVE_LOW.
+Example:
+        sdhci0_pwrseq {
+                compatible = "mmc-pwrseq-emmc";
+                reset-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+        }
diff --git a/Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt b/Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt
new file mode 100644
index 000000000000..a462c50f19a8
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt
@@ -0,0 +1,25 @@
+* The simple MMC power sequence provider
+The purpose of the simple MMC power sequence provider is to supports a set of
+common properties between various SOC designs. It thus enables us to use the
+same provider for several SOC designs.
+Required properties:
+- compatible : contains "mmc-pwrseq-simple".
+Optional properties:
+- reset-gpios : contains a list of GPIO specifiers. The reset GPIOs are asserted
+        at initialization and prior we start the power up procedure of the card.
+        They will be de-asserted right after the power has been provided to the
+        card.
+- clocks : Must contain an entry for the entry in clock-names.
+  See ../clocks/clock-bindings.txt for details.
+- clock-names : Must include the following entry:
+  "ext_clock" (External clock provided to the card).
+Example:
+        sdhci0_pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                reset-gpios = <&gpio1 12 0>;
+        }
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index b52628b18a53..438899e8829b 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -64,7 +64,43 @@ Optional SDIO properties:
 - keep-power-in-suspend: Preserves card power during a suspend/resume cycle
 - enable-sdio-wakeup: Enables wake up of host system on SDIO IRQ assertion
-Example:
+MMC power sequences:
+--------------------
+System on chip designs may specify a specific MMC power sequence. To
+successfully detect an (e)MMC/SD/SDIO card, that power sequence must be
+maintained while initializing the card.
+Optional property:
+- mmc-pwrseq: phandle to the MMC power sequence node. See "mmc-pwrseq-*"
+        for documentation of MMC power sequence bindings.
+Use of Function subnodes
+------------------------
+On embedded systems the cards connected to a host may need additional
+properties. These can be specified in subnodes to the host controller node.
+The subnodes are identified by the standard 'reg' property.
+Which information exactly can be specified depends on the bindings for the
+SDIO function driver for the subnode, as specified by the compatible string.
+Required host node properties when using function subnodes:
+- #address-cells: should be one. The cell is the slot id.
+- #size-cells: should be zero.
+Required function subnode properties:
+- compatible: name of SDIO function following generic names recommended practice
+- reg: Must contain the SDIO function number of the function this subnode
+       describes. A value of 0 denotes the memory SD function, values from
+       1 to 7 denote the SDIO functions.
+Examples
+--------
+Basic example:
 sdhci@ab000000 {
        compatible = "sdhci";
@@ -77,4 +113,28 @@ sdhci@ab000000 {
        max-frequency = <50000000>;
        keep-power-in-suspend;
        enable-sdio-wakeup;
+        mmc-pwrseq = <&sdhci0_pwrseq>
 }
+Example with sdio function subnode:
+mmc3: mmc@01c12000 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc3_pins_a>;
+        vmmc-supply = <&reg_vmmc3>;
+        bus-width = <4>;
+        non-removable;
+        mmc-pwrseq = <&sdhci0_pwrseq>
+        status = "okay";
+        brcmf: bcrmf@1 {
+                reg = <1>;
+                compatible = "brcm,bcm43xx-fmac";
+                interrupt-parent = <&pio>;
+                interrupts = <10 8>; /* PH10 / EINT10 */
+                interrupt-names = "host-wake";
+        };
+};
diff --git a/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
index f357c16ea815..15b8368ee1f2 100644
--- a/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
@@ -7,7 +7,11 @@ This file documents differences between the core properties described
 by mmc.txt and the properties used by the sdhci-tegra driver.
 Required properties:
- compatible : Should be "nvidia,<chip>-sdhci"
+- compatible : For Tegra20, must contain "nvidia,tegra20-sdhci".
+  For Tegra30, must contain "nvidia,tegra30-sdhci".  For Tegra114,
+  must contain "nvidia,tegra114-sdhci".  For Tegra124, must contain
+  "nvidia,tegra124-sdhci".  Otherwise, must contain "nvidia,<chip>-sdhci",
+  plus one of the above, where <chip> is tegra132 or tegra210.
 - clocks : Must contain one entry, for the module clock.
  See ../clocks/clock-bindings.txt for details.
 - resets : Must contain an entry for each entry in reset-names.
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt b/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt
new file mode 100644
index 000000000000..de2c53cff4f1
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt
@@ -0,0 +1,30 @@
+* Fujitsu SDHCI controller
+This file documents differences between the core properties in mmc.txt
+and the properties used by the sdhci_f_sdh30 driver.
+Required properties:
+- compatible: "fujitsu,mb86s70-sdhci-3.0"
+- clocks: Must contain an entry for each entry in clock-names. It is a
+  list of phandles and clock-specifier pairs.
+  See ../clocks/clock-bindings.txt for details.
+- clock-names: Should contain the following two entries:
+        "iface" - clock used for sdhci interface
+        "core"  - core clock for sdhci controller
+Optional properties:
+- vqmmc-supply: phandle to the regulator device tree node, mentioned
+  as the VCCQ/VDD_IO supply in the eMMC/SD specs.
+Example:
+        sdhci1: mmc@36600000 {
+                compatible = "fujitsu,mb86s70-sdhci-3.0";
+                reg = <0 0x36600000 0x1000>;
+                interrupts = <0 172 0x4>,
+                             <0 173 0x4>;
+                bus-width = <4>;
+                vqmmc-supply = <&vccq_sdhci1>;
+                clocks = <&clock 2 2 0>, <&clock 2 3 0>;
+                clock-names = "iface", "core";
+        };
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
index 4dd6deb90719..3d1b449d6097 100644
--- a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
+++ b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
@@ -9,9 +9,13 @@ Required properties:
 - reg:
  * for "mrvl,pxav2-mmc" and "mrvl,pxav3-mmc", one register area for
    the SDHCI registers.
-  * for "marvell,armada-380-sdhci", two register areas. The first one
-    for the SDHCI registers themselves, and the second one for the
+  * for "marvell,armada-380-sdhci", three register areas. The first
-    AXI/Mbus bridge registers of the SDHCI unit.
+    one for the SDHCI registers themselves, the second one for the
+    AXI/Mbus bridge registers of the SDHCI unit, the third one for the
+    SDIO3 Configuration register
+- reg names: should be "sdhci", "mbus", "conf-sdio3". only mandatory
+  for "marvell,armada-380-sdhci"
 - 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
@@ -35,7 +39,10 @@ sdhci@d4280800 {
 sdhci@d8000 {
        compatible = "marvell,armada-380-sdhci";
-        reg = <0xd8000 0x1000>, <0xdc000 0x100>;
+        reg-names = "sdhci", "mbus", "conf-sdio3";
+        reg = <0xd8000 0x1000>,
+                <0xdc000 0x100>;
+                <0x18454 0x4>;
        interrupts = <0 25 0x4>;
        clocks = <&gateclk 17>;
        clock-names = "io";
diff --git a/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/Documentation/devicetree/bindings/mtd/atmel-nand.txt
index 1fe6dde98499..7d4c8eb775a5 100644
--- a/Documentation/devicetree/bindings/mtd/atmel-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/atmel-nand.txt
@@ -1,7 +1,7 @@
 Atmel NAND flash
 Required properties:
- compatible : "atmel,at91rm9200-nand".
+- compatible : should be "atmel,at91rm9200-nand" or "atmel,sama5d4-nand".
 - 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
diff --git a/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt b/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt
index 823d13412195..4461dc71cb10 100644
--- a/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt
+++ b/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt
@@ -1,7 +1,7 @@
 * Freescale Quad Serial Peripheral Interface(QuadSPI)
 Required properties:
-  - compatible : Should be "fsl,vf610-qspi"
+  - compatible : Should be "fsl,vf610-qspi" or "fsl,imx6sx-qspi"
  - reg : the first contains the register location and length,
          the second contains the memory mapping address and length
  - reg-names: Should contain the reg names "QuadSPI" and "QuadSPI-memory"
diff --git a/Documentation/devicetree/bindings/mtd/fsmc-nand.txt b/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
index ec42935f3908..5235cbc551b0 100644
--- a/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
@@ -9,7 +9,7 @@ Required properties:
 Optional properties:
 - bank-width : Width (in bytes) of the device.  If not present, the width
  defaults to 1 byte
- nand-skip-bbtscan: Indicates the the BBT scanning should be skipped
+- nand-skip-bbtscan: Indicates the BBT scanning should be skipped
 - timings: array of 6 bytes for NAND timings. The meanings of these bytes
  are:
  byte 0 TCLR  : CLE to RE delay in number of AHB clock cycles, only 4 bits
diff --git a/Documentation/devicetree/bindings/mtd/gpmi-nand.txt b/Documentation/devicetree/bindings/mtd/gpmi-nand.txt
index a011fdf61dbf..d02acaff3c35 100644
--- a/Documentation/devicetree/bindings/mtd/gpmi-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpmi-nand.txt
@@ -1,7 +1,7 @@
 * Freescale General-Purpose Media Interface (GPMI)
 The GPMI nand controller provides an interface to control the
-NAND flash chips. We support only one NAND chip now.
+NAND flash chips.
 Required properties:
  - compatible : should be "fsl,<chip>-gpmi-nand"
diff --git a/Documentation/devicetree/bindings/mtd/hisi504-nand.txt b/Documentation/devicetree/bindings/mtd/hisi504-nand.txt
new file mode 100644
index 000000000000..2e35f0662912
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/hisi504-nand.txt
@@ -0,0 +1,47 @@
+Hisilicon Hip04 Soc NAND controller DT binding
+Required properties:
+- compatible:          Should be "hisilicon,504-nfc".
+- reg:                 The first contains base physical address and size of
+                       NAND controller's registers. The second contains base
+                       physical address and size of NAND controller's buffer.
+- interrupts:          Interrupt number for nfc.
+- nand-bus-width:      See nand.txt.
+- nand-ecc-mode:       Support none and hw ecc mode.
+- #address-cells:      Partition address, should be set 1.
+- #size-cells:         Partition size, should be set 1.
+Optional properties:
+- nand-ecc-strength:   Number of bits to correct per ECC step.
+- nand-ecc-step-size:  Number of data bytes covered by a single ECC step.
+The following ECC strength and step size are currently supported:
+ - nand-ecc-strength = <16>, nand-ecc-step-size = <1024>
+Flash chip may optionally contain additional sub-nodes describing partitions of
+the address space. See partition.txt for more detail.
+Example:
+        nand: nand@4020000 {
+                compatible = "hisilicon,504-nfc";
+                reg = <0x4020000 0x10000>, <0x5000000 0x1000>;
+                interrupts = <0 379 4>;
+                nand-bus-width = <8>;
+                nand-ecc-mode = "hw";
+                nand-ecc-strength = <16>;
+                nand-ecc-step-size = <1024>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                partition@0 {
+                        label = "nand_text";
+                        reg = <0x00000000 0x00400000>;
+                };
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/mtd/mtd-physmap.txt b/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
index 6b9f680cb579..4a0a48bf4ecb 100644
--- a/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
+++ b/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
@@ -36,6 +36,11 @@ are defined:
 - vendor-id : Contains the flash chip's vendor id (1 byte).
 - device-id : Contains the flash chip's device id (1 byte).
+For ROM compatible devices (and ROM fallback from cfi-flash), the following
+additional (optional) property is defined:
+ - erase-size : The chip's physical erase block size in bytes.
 The device tree may optionally contain sub-nodes describing partitions of the
 address space. See partition.txt for more detail.
diff --git a/Documentation/devicetree/bindings/net/amd-xgbe-phy.txt b/Documentation/devicetree/bindings/net/amd-xgbe-phy.txt
index 42409bfe04c4..33df3932168e 100644
--- a/Documentation/devicetree/bindings/net/amd-xgbe-phy.txt
+++ b/Documentation/devicetree/bindings/net/amd-xgbe-phy.txt
@@ -7,17 +7,38 @@ Required properties:
   - SerDes Rx/Tx registers
   - SerDes integration registers (1/2)
   - SerDes integration registers (2/2)
+- interrupt-parent: Should be the phandle for the interrupt controller
+  that services interrupts for this device
+- interrupts: Should contain the amd-xgbe-phy interrupt.
 Optional properties:
 - amd,speed-set: Speed capabilities of the device
    0 - 1GbE and 10GbE (default)
    1 - 2.5GbE and 10GbE
+The following optional properties are represented by an array with each
+value corresponding to a particular speed. The first array value represents
+the setting for the 1GbE speed, the second value for the 2.5GbE speed and
+the third value for the 10GbE speed.  All three values are required if the
+property is used.
+- amd,serdes-blwc: Baseline wandering correction enablement
+    0 - Off
+    1 - On
+- amd,serdes-cdr-rate: CDR rate speed selection
+- amd,serdes-pq-skew: PQ (data sampling) skew
+- amd,serdes-tx-amp: TX amplitude boost
 Example:
        xgbe_phy@e1240800 {
                compatible = "amd,xgbe-phy-seattle-v1a", "ethernet-phy-ieee802.3-c45";
                reg = <0 0xe1240800 0 0x00400>,
                      <0 0xe1250000 0 0x00060>,
                      <0 0xe1250080 0 0x00004>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 323 4>;
                amd,speed-set = <0>;
+                amd,serdes-blwc = <1>, <1>, <0>;
+                amd,serdes-cdr-rate = <2>, <2>, <7>;
+                amd,serdes-pq-skew = <10>, <10>, <30>;
+                amd,serdes-tx-amp = <15>, <15>, <10>;
        };
diff --git a/Documentation/devicetree/bindings/net/broadcom-systemport.txt b/Documentation/devicetree/bindings/net/broadcom-systemport.txt
index aa7ad622259d..877da34145b0 100644
--- a/Documentation/devicetree/bindings/net/broadcom-systemport.txt
+++ b/Documentation/devicetree/bindings/net/broadcom-systemport.txt
@@ -3,7 +3,7 @@
 Required properties:
 - compatible: should be one of "brcm,systemport-v1.00" or "brcm,systemport"
 - reg: address and length of the register set for the device.
- interrupts: interrupts for the device, first cell must be for the the rx
+- interrupts: interrupts for the device, first cell must be for the rx
  interrupts, and the second cell should be for the transmit queues. An
  optional third interrupt cell for Wake-on-LAN can be specified
 - local-mac-address: Ethernet MAC address (48 bits) of this adapter
diff --git a/Documentation/devicetree/bindings/net/davicom-dm9000.txt b/Documentation/devicetree/bindings/net/davicom-dm9000.txt
index 28767ed7c1bd..5224bf05f6f8 100644
--- a/Documentation/devicetree/bindings/net/davicom-dm9000.txt
+++ b/Documentation/devicetree/bindings/net/davicom-dm9000.txt
@@ -11,6 +11,8 @@ Required properties:
 Optional properties:
 - davicom,no-eeprom : Configuration EEPROM is not available
 - davicom,ext-phy : Use external PHY
+- reset-gpios : phandle of gpio that will be used to reset chip during probe
+- vcc-supply : phandle of regulator that will be used to enable power to chip
 Example:
@@ -21,4 +23,6 @@ Example:
                interrupts = <7 4>;
                local-mac-address = [00 00 de ad be ef];
                davicom,no-eeprom;
+                reset-gpios = <&gpf 12 GPIO_ACTIVE_LOW>;
+                vcc-supply = <&eth0_power>;
        };
diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt
index 0c8775c45798..a9eb611bee68 100644
--- a/Documentation/devicetree/bindings/net/fsl-fec.txt
+++ b/Documentation/devicetree/bindings/net/fsl-fec.txt
@@ -22,6 +22,8 @@ Optional properties:
 - fsl,num-rx-queues : The property is valid for enet-avb IP, which supports
  hw multi queues. Should specify the rx queue number, otherwise set rx queue
  number to 1.
+- fsl,magic-packet : If present, indicates that the hardware supports waking
+  up via magic packet.
 Optional subnodes:
 - mdio : specifies the mdio bus in the FEC, used as a container for phy nodes
diff --git a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
index be6ea8960f20..1e97532a0b79 100644
--- a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
+++ b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
@@ -8,7 +8,16 @@ of how to define a PHY.
 Required properties:
  - reg : Offset and length of the register set for the device
  - compatible : Should define the compatible device type for the
-    mdio.  Currently, this is most likely to be "fsl,gianfar-mdio"
+    mdio. Currently supported strings/devices are:
+        - "fsl,gianfar-tbi"
+        - "fsl,gianfar-mdio"
+        - "fsl,etsec2-tbi"
+        - "fsl,etsec2-mdio"
+        - "fsl,ucc-mdio"
+        - "fsl,fman-mdio"
+    When device_type is "mdio", the following strings are also considered:
+        - "gianfar"
+        - "ucc_geth_phy"
 Example:
diff --git a/Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt b/Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt
new file mode 100644
index 000000000000..988fc694b663
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt
@@ -0,0 +1,88 @@
+Hisilicon hip04 Ethernet Controller
+* Ethernet controller node
+Required properties:
+- compatible: should be "hisilicon,hip04-mac".
+- reg: address and length of the register set for the device.
+- interrupts: interrupt for the device.
+- port-handle: <phandle port channel>
+        phandle, specifies a reference to the syscon ppe node
+        port, port number connected to the controller
+        channel, recv channel start from channel * number (RX_DESC_NUM)
+- phy-mode: see ethernet.txt [1].
+Optional properties:
+- phy-handle: see ethernet.txt [1].
+[1] Documentation/devicetree/bindings/net/ethernet.txt
+* Ethernet ppe node:
+Control rx & tx fifos of all ethernet controllers.
+Have 2048 recv channels shared by all ethernet controllers, only if no overlap.
+Each controller's recv channel start from channel * number (RX_DESC_NUM).
+Required properties:
+- compatible: "hisilicon,hip04-ppe", "syscon".
+- reg: address and length of the register set for the device.
+* MDIO bus node:
+Required properties:
+- compatible: should be "hisilicon,hip04-mdio".
+- Inherits from MDIO bus node binding [2]
+[2] Documentation/devicetree/bindings/net/phy.txt
+Example:
+        mdio {
+                compatible = "hisilicon,hip04-mdio";
+                reg = <0x28f1000 0x1000>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                phy0: ethernet-phy@0 {
+                        compatible = "ethernet-phy-ieee802.3-c22";
+                        reg = <0>;
+                        marvell,reg-init = <18 0x14 0 0x8001>;
+                };
+                phy1: ethernet-phy@1 {
+                        compatible = "ethernet-phy-ieee802.3-c22";
+                        reg = <1>;
+                        marvell,reg-init = <18 0x14 0 0x8001>;
+                };
+        };
+        ppe: ppe@28c0000 {
+                compatible = "hisilicon,hip04-ppe", "syscon";
+                reg = <0x28c0000 0x10000>;
+        };
+        fe: ethernet@28b0000 {
+                compatible = "hisilicon,hip04-mac";
+                reg = <0x28b0000 0x10000>;
+                interrupts = <0 413 4>;
+                phy-mode = "mii";
+                port-handle = <&ppe 31 0>;
+        };
+        ge0: ethernet@2800000 {
+                compatible = "hisilicon,hip04-mac";
+                reg = <0x2800000 0x10000>;
+                interrupts = <0 402 4>;
+                phy-mode = "sgmii";
+                port-handle = <&ppe 0 1>;
+                phy-handle = <&phy0>;
+        };
+        ge8: ethernet@2880000 {
+                compatible = "hisilicon,hip04-mac";
+                reg = <0x2880000 0x10000>;
+                interrupts = <0 410 4>;
+                phy-mode = "sgmii";
+                port-handle = <&ppe 8 2>;
+                phy-handle = <&phy1>;
+        };
diff --git a/Documentation/devicetree/bindings/net/keystone-netcp.txt b/Documentation/devicetree/bindings/net/keystone-netcp.txt
new file mode 100644
index 000000000000..f9c07710478d
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/keystone-netcp.txt
@@ -0,0 +1,197 @@
+This document describes the device tree bindings associated with the
+keystone network coprocessor(NetCP) driver support.
+The network coprocessor (NetCP) is a hardware accelerator that processes
+Ethernet packets. NetCP has a gigabit Ethernet (GbE) subsytem with a ethernet
+switch sub-module to send and receive packets. NetCP also includes a packet
+accelerator (PA) module to perform packet classification operations such as
+header matching, and packet modification operations such as checksum
+generation. NetCP can also optionally include a Security Accelerator (SA)
+capable of performing IPSec operations on ingress/egress packets.
+Keystone II SoC's also have a 10 Gigabit Ethernet Subsystem (XGbE) which
+includes a 3-port Ethernet switch sub-module capable of 10Gb/s and 1Gb/s rates
+per Ethernet port.
+Keystone NetCP driver has a plug-in module architecture where each of the NetCP
+sub-modules exist as a loadable kernel module which plug in to the netcp core.
+These sub-modules are represented as "netcp-devices" in the dts bindings. It is
+mandatory to have the ethernet switch sub-module for the ethernet interface to
+be operational. Any other sub-module like the PA is optional.
+NetCP Ethernet SubSystem Layout:
+-----------------------------
+  NetCP subsystem(10G or 1G)
+-----------------------------
+        |
+        |-> NetCP Devices ->    |
+        |                       |-> GBE/XGBE Switch
+        |                       |
+        |                       |-> Packet Accelerator
+        |                       |
+        |                       |-> Security Accelerator
+        |
+        |
+        |
+        |-> NetCP Interfaces -> |
+                                |-> Ethernet Port 0
+                                |
+                                |-> Ethernet Port 1
+                                |
+                                |-> Ethernet Port 2
+                                |
+                                |-> Ethernet Port 3
+NetCP subsystem properties:
+Required properties:
+- compatible:   Should be "ti,netcp-1.0"
+- clocks:       phandle to the reference clocks for the subsystem.
+- dma-id:       Navigator packet dma instance id.
+Optional properties:
+- reg:          register location and the size for the following register
+                regions in the specified order.
+                - Efuse MAC address register
+- dma-coherent: Present if dma operations are coherent
+- big-endian:   Keystone devices can be operated in a mode where the DSP is in
+                the big endian mode. In such cases enable this option. This
+                option should also be enabled if the ARM is operated in
+                big endian mode with the DSP in little endian.
+NetCP device properties: Device specification for NetCP sub-modules.
+1Gb/10Gb (gbe/xgbe) ethernet switch sub-module specifications.
+Required properties:
+- label:        Must be "netcp-gbe" for 1Gb & "netcp-xgbe" for 10Gb.
+- reg:          register location and the size for the following register
+                regions in the specified order.
+                - subsystem registers
+                - serdes registers
+- tx-channel:   the navigator packet dma channel name for tx.
+- tx-queue:     the navigator queue number associated with the tx dma channel.
+- interfaces:   specification for each of the switch port to be registered as a
+                network interface in the stack.
+-- slave-port:  Switch port number, 0 based numbering.
+-- link-interface:      type of link interface, supported options are
+                        - mac<->mac auto negotiate mode: 0
+                        - mac<->phy mode: 1
+                        - mac<->mac forced mode: 2
+                        - mac<->fiber mode: 3
+                        - mac<->phy mode with no mdio: 4
+                        - 10Gb mac<->phy mode : 10
+                        - 10Gb mac<->mac forced mode : 11
+----phy-handle: phandle to PHY device
+Optional properties:
+- enable-ale:   NetCP driver keeps the address learning feature in the ethernet
+                switch module disabled. This attribute is to enable the address
+                learning.
+- secondary-slave-ports:        specification for each of the switch port not be
+                                registered as a network interface. NetCP driver
+                                will only initialize these ports and attach PHY
+                                driver to them if needed.
+NetCP interface properties: Interface specification for NetCP sub-modules.
+Required properties:
+- rx-channel:   the navigator packet dma channel name for rx.
+- rx-queue:     the navigator queue number associated with rx dma channel.
+- rx-pool:      specifies the number of descriptors to be used & the region-id
+                for creating the rx descriptor pool.
+- tx-pool:      specifies the number of descriptors to be used & the region-id
+                for creating the tx descriptor pool.
+- rx-queue-depth:       number of descriptors in each of the free descriptor
+                        queue (FDQ) for the pktdma Rx flow. There can be at
+                        present a maximum of 4 queues per Rx flow.
+- rx-buffer-size:       the buffer size for each of the Rx flow FDQ.
+- tx-completion-queue:  the navigator queue number where the descriptors are
+                        recycled after Tx DMA completion.
+Optional properties:
+- efuse-mac:    If this is 1, then the MAC address for the interface is
+                obtained from the device efuse mac address register
+- local-mac-address:    the driver is designed to use the of_get_mac_address api
+                        only if efuse-mac is 0. When efuse-mac is 0, the MAC
+                        address is obtained from local-mac-address. If this
+                        attribute is not present, then the driver will use a
+                        random MAC address.
+- "netcp-device label": phandle to the device specification for each of NetCP
+                        sub-module attached to this interface.
+Example binding:
+netcp: netcp@2090000 {
+        reg = <0x2620110 0x8>;
+        reg-names = "efuse";
+        compatible = "ti,netcp-1.0";
+        #address-cells = <1>;
+        #size-cells = <1>;
+        ranges;
+        clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;
+        dma-coherent;
+        /* big-endian; */
+        dma-id = <0>;
+        netcp-devices {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                gbe@0x2090000 {
+                        label = "netcp-gbe";
+                        reg = <0x2090000 0xf00>;
+                        /* enable-ale; */
+                        tx-queue = <648>;
+                        tx-channel = <8>;
+                        interfaces {
+                                gbe0: interface-0 {
+                                        slave-port = <0>;
+                                        link-interface  = <4>;
+                                };
+                                gbe1: interface-1 {
+                                        slave-port = <1>;
+                                        link-interface  = <4>;
+                                };
+                        };
+                        secondary-slave-ports {
+                                port-2 {
+                                        slave-port = <2>;
+                                        link-interface  = <2>;
+                                };
+                                port-3 {
+                                        slave-port = <3>;
+                                        link-interface  = <2>;
+                                };
+                        };
+                };
+        };
+        netcp-interfaces {
+                interface-0 {
+                        rx-channel = <22>;
+                        rx-pool = <1024 12>;
+                        tx-pool = <1024 12>;
+                        rx-queue-depth = <128 128 0 0>;
+                        rx-buffer-size = <1518 4096 0 0>;
+                        rx-queue = <8704>;
+                        tx-completion-queue = <8706>;
+                        efuse-mac = <1>;
+                        netcp-gbe = <&gbe0>;
+                };
+                interface-1 {
+                        rx-channel = <23>;
+                        rx-pool = <1024 12>;
+                        tx-pool = <1024 12>;
+                        rx-queue-depth = <128 128 0 0>;
+                        rx-buffer-size = <1518 4096 0 0>;
+                        rx-queue = <8705>;
+                        tx-completion-queue = <8707>;
+                        efuse-mac = <0>;
+                        local-mac-address = [02 18 31 7e 3e 6f];
+                        netcp-gbe = <&gbe1>;
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/net/nfc/st21nfca.txt b/Documentation/devicetree/bindings/net/nfc/st21nfca.txt
index e4faa2e8dfeb..7bb2e213d6f9 100644
--- a/Documentation/devicetree/bindings/net/nfc/st21nfca.txt
+++ b/Documentation/devicetree/bindings/net/nfc/st21nfca.txt
@@ -1,7 +1,7 @@
 * STMicroelectronics SAS. ST21NFCA NFC Controller
 Required properties:
- compatible: Should be "st,st21nfca_i2c".
+- compatible: Should be "st,st21nfca-i2c".
 - clock-frequency: I²C work frequency.
 - reg: address on the bus
 - interrupt-parent: phandle for the interrupt gpio controller
@@ -11,6 +11,10 @@ Required properties:
 Optional SoC Specific Properties:
 - pinctrl-names: Contains only one value - "default".
 - pintctrl-0: Specifies the pin control groups used for this controller.
+- ese-present: Specifies that an ese is physically connected to the nfc
+controller.
+- uicc-present: Specifies that the uicc swp signal can be physically
+connected to the nfc controller.
 Example (for ARM-based BeagleBoard xM with ST21NFCA on I2C2):
@@ -20,7 +24,7 @@ Example (for ARM-based BeagleBoard xM with ST21NFCA on I2C2):
        st21nfca: st21nfca@1 {
-                compatible = "st,st21nfca_i2c";
+                compatible = "st,st21nfca-i2c";
                reg = <0x01>;
                clock-frequency = <400000>;
@@ -29,5 +33,8 @@ Example (for ARM-based BeagleBoard xM with ST21NFCA on I2C2):
                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
                enable-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;
+                ese-present;
+                uicc-present;
        };
 };
diff --git a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt b/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
index 9005608cbbd1..bb237072dbe9 100644
--- a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
+++ b/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
@@ -1,7 +1,7 @@
 * STMicroelectronics SAS. ST21NFCB NFC Controller
 Required properties:
- compatible: Should be "st,st21nfcb_i2c".
+- compatible: Should be "st,st21nfcb-i2c".
 - clock-frequency: I²C work frequency.
 - reg: address on the bus
 - interrupt-parent: phandle for the interrupt gpio controller
@@ -20,7 +20,7 @@ Example (for ARM-based BeagleBoard xM with ST21NFCB on I2C2):
        st21nfcb: st21nfcb@8 {
-                compatible = "st,st21nfcb_i2c";
+                compatible = "st,st21nfcb-i2c";
                reg = <0x08>;
                clock-frequency = <400000>;
diff --git a/Documentation/devicetree/bindings/net/rockchip-dwmac.txt b/Documentation/devicetree/bindings/net/rockchip-dwmac.txt
new file mode 100644
index 000000000000..21fd199e89b5
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/rockchip-dwmac.txt
@@ -0,0 +1,68 @@
+Rockchip SoC RK3288 10/100/1000 Ethernet driver(GMAC)
+The device node has following properties.
+Required properties:
+ - compatible: Can be "rockchip,rk3288-gmac".
+ - reg: addresses and length of the register sets for the device.
+ - interrupts: Should contain the GMAC interrupts.
+ - interrupt-names: Should contain the interrupt names "macirq".
+ - rockchip,grf: phandle to the syscon grf used to control speed and mode.
+ - clocks: <&cru SCLK_MAC>: clock selector for main clock, from PLL or PHY.
+           <&cru SCLK_MAC_PLL>: PLL clock for SCLK_MAC
+           <&cru SCLK_MAC_RX>: clock gate for RX
+           <&cru SCLK_MAC_TX>: clock gate for TX
+           <&cru SCLK_MACREF>: clock gate for RMII referce clock
+           <&cru SCLK_MACREF_OUT> clock gate for RMII reference clock output
+           <&cru ACLK_GMAC>: AXI clock gate for GMAC
+           <&cru PCLK_GMAC>: APB clock gate for GMAC
+ - clock-names: One name for each entry in the clocks property.
+ - phy-mode: See ethernet.txt file in the same directory.
+ - pinctrl-names: Names corresponding to the numbered pinctrl states.
+ - pinctrl-0: pin-control mode. can be <&rgmii_pins> or <&rmii_pins>.
+ - clock_in_out: For RGMII, it must be "input", means main clock(125MHz)
+   is not sourced from SoC's PLL, but input from PHY; For RMII, "input" means
+   PHY provides the reference clock(50MHz), "output" means GMAC provides the
+   reference clock.
+ - snps,reset-gpio       gpio number for phy reset.
+ - snps,reset-active-low boolean flag to indicate if phy reset is active low.
+ - assigned-clocks: main clock, should be <&cru SCLK_MAC>;
+ - assigned-clock-parents = parent of main clock.
+   can be <&ext_gmac> or <&cru SCLK_MAC_PLL>.
+Optional properties:
+ - tx_delay: Delay value for TXD timing. Range value is 0~0x7F, 0x30 as default.
+ - rx_delay: Delay value for RXD timing. Range value is 0~0x7F, 0x10 as default.
+ - phy-supply: phandle to a regulator if the PHY needs one
+Example:
+gmac: ethernet@ff290000 {
+        compatible = "rockchip,rk3288-gmac";
+        reg = <0xff290000 0x10000>;
+        interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+        interrupt-names = "macirq";
+        rockchip,grf = <&grf>;
+        clocks = <&cru SCLK_MAC>,
+                <&cru SCLK_MAC_RX>, <&cru SCLK_MAC_TX>,
+                <&cru SCLK_MACREF>, <&cru SCLK_MACREF_OUT>,
+                <&cru ACLK_GMAC>, <&cru PCLK_GMAC>;
+        clock-names = "stmmaceth",
+                "mac_clk_rx", "mac_clk_tx",
+                "clk_mac_ref", "clk_mac_refout",
+                "aclk_mac", "pclk_mac";
+        phy-mode = "rgmii";
+        pinctrl-names = "default";
+        pinctrl-0 = <&rgmii_pins /*&rmii_pins*/>;
+        clock_in_out = "input";
+        snps,reset-gpio = <&gpio4 7 0>;
+        snps,reset-active-low;
+        assigned-clocks = <&cru SCLK_MAC>;
+        assigned-clock-parents = <&ext_gmac>;
+        tx_delay = <0x30>;
+        rx_delay = <0x10>;
+        status = "ok";
+};
diff --git a/Documentation/devicetree/bindings/net/sti-dwmac.txt b/Documentation/devicetree/bindings/net/sti-dwmac.txt
index 6762a6b5da7e..d05c1e1fd9b6 100644
--- a/Documentation/devicetree/bindings/net/sti-dwmac.txt
+++ b/Documentation/devicetree/bindings/net/sti-dwmac.txt
@@ -9,14 +9,10 @@ The device node has following properties.
 Required properties:
 - compatible   : Can be "st,stih415-dwmac", "st,stih416-dwmac",
   "st,stih407-dwmac", "st,stid127-dwmac".
- - reg : Offset of the glue configuration register map in system
+ - st,syscon : Should be phandle/offset pair. The phandle to the syscon node which
-   configuration regmap pointed by st,syscon property and size.
+   encompases the glue register, and the offset of the control register.
- - st,syscon : Should be phandle to system configuration node which
-   encompases this glue registers.
 - st,gmac_en: this is to enable the gmac into a dedicated sysctl control
   register available on STiH407 SoC.
- - sti-ethconf: this is the gmac glue logic register to enable the GMAC,
-   select among the different modes and program the clk retiming.
 - pinctrl-0: pin-control for all the MII mode supported.
 Optional properties:
@@ -40,10 +36,10 @@ ethernet0: dwmac@9630000 {
        device_type = "network";
        status = "disabled";
        compatible = "st,stih407-dwmac", "snps,dwmac", "snps,dwmac-3.710";
-        reg = <0x9630000 0x8000>, <0x80 0x4>;
+        reg = <0x9630000 0x8000>;
-        reg-names = "stmmaceth", "sti-ethconf";
+        reg-names = "stmmaceth";
-        st,syscon = <&syscfg_sbc_reg>;
+        st,syscon = <&syscfg_sbc_reg 0x80>;
        st,gmac_en;
        resets = <&softreset STIH407_ETH1_SOFTRESET>;
        reset-names = "stmmaceth";
diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
index c41afd963edf..8ca65cec52ae 100644
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@ -43,6 +43,7 @@ Optional properties:
  available this clock is used for programming the Timestamp Addend Register.
  If not passed then the system clock will be used and this is fine on some
  platforms.
+- snps,burst_len: The AXI burst lenth value of the AXI BUS MODE register.
 Examples:
diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
new file mode 100644
index 000000000000..edefc26c6204
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
@@ -0,0 +1,30 @@
+* Qualcomm Atheros ath10k wireless devices
+For ath10k devices the calibration data can be provided through Device
+Tree. The node is a child node of the PCI controller.
+Required properties:
+-compatible : Should be "qcom,ath10k"
+Optional properties:
+- qcom,ath10k-calibration-data : calibration data as an array, the
+                                 length can vary between hw versions
+Example:
+pci {
+        pcie@0 {
+                reg = <0 0 0 0 0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                ath10k@0,0 {
+                        reg = <0 0 0 0 0>;
+                        device_type = "pci";
+                        qcom,ath10k-calibration-data = [ 01 02 03 ... ];
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/panel/avic,tm070ddh03.txt b/Documentation/devicetree/bindings/panel/avic,tm070ddh03.txt
new file mode 100644
index 000000000000..b6f2f3e8f44e
--- /dev/null
+++ b/Documentation/devicetree/bindings/panel/avic,tm070ddh03.txt
@@ -0,0 +1,7 @@
+Shanghai AVIC Optoelectronics 7" 1024x600 color TFT-LCD panel
+Required properties:
+- compatible: should be "avic,tm070ddh03"
+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/giantplus,gpg482739qs5.txt b/Documentation/devicetree/bindings/panel/giantplus,gpg482739qs5.txt
new file mode 100644
index 000000000000..24b0b624434b
--- /dev/null
+++ b/Documentation/devicetree/bindings/panel/giantplus,gpg482739qs5.txt
@@ -0,0 +1,7 @@
+GiantPlus GPG48273QS5 4.3" (480x272) WQVGA TFT LCD panel
+Required properties:
+- compatible: should be "giantplus,gpg48273qs5"
+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/pci/nvidia,tegra20-pcie.txt b/Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
index d763e047c6ae..75321ae23c08 100644
--- a/Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
+++ b/Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
@@ -1,10 +1,10 @@
 NVIDIA Tegra PCIe controller
 Required properties:
- compatible: Must be one of:
+- compatible: For Tegra20, must contain "nvidia,tegra20-pcie".  For Tegra30,
-  - "nvidia,tegra20-pcie"
+  "nvidia,tegra30-pcie".  For Tegra124, must contain "nvidia,tegra124-pcie".
-  - "nvidia,tegra30-pcie"
+  Otherwise, must contain "nvidia,<chip>-pcie", plus one of the above, where
-  - "nvidia,tegra124-pcie"
+  <chip> is tegra132 or tegra210.
 - device_type: Must be "pci"
 - reg: A list of physical base address and length for each set of controller
  registers. Must contain an entry for each entry in the reg-names property.
diff --git a/Documentation/devicetree/bindings/pci/versatile.txt b/Documentation/devicetree/bindings/pci/versatile.txt
new file mode 100644
index 000000000000..ebd1e7d0403e
--- /dev/null
+++ b/Documentation/devicetree/bindings/pci/versatile.txt
@@ -0,0 +1,59 @@
+* ARM Versatile Platform Baseboard PCI interface
+PCI host controller found on the ARM Versatile PB board's FPGA.
+Required properties:
+- compatible: should contain "arm,versatile-pci" to identify the Versatile PCI
+  controller.
+- reg: base addresses and lengths of the pci controller. There must be 3
+  entries:
+        - Versatile-specific registers
+        - Self Config space
+        - Config space
+- #address-cells: set to <3>
+- #size-cells: set to <2>
+- device_type: set to "pci"
+- bus-range: set to <0 0xff>
+- ranges: ranges for the PCI memory and I/O regions
+- #interrupt-cells: set to <1>
+- interrupt-map-mask and interrupt-map: standard PCI properties to define
+        the mapping of the PCI interface to interrupt numbers.
+Example:
+pci-controller@10001000 {
+        compatible = "arm,versatile-pci";
+        device_type = "pci";
+        reg = <0x10001000 0x1000
+               0x41000000 0x10000
+               0x42000000 0x100000>;
+        bus-range = <0 0xff>;
+        #address-cells = <3>;
+        #size-cells = <2>;
+        #interrupt-cells = <1>;
+        ranges = <0x01000000 0 0x00000000 0x43000000 0 0x00010000   /* downstream I/O */
+                  0x02000000 0 0x50000000 0x50000000 0 0x10000000   /* non-prefetchable memory */
+                  0x42000000 0 0x60000000 0x60000000 0 0x10000000>; /* prefetchable memory */
+        interrupt-map-mask = <0x1800 0 0 7>;
+        interrupt-map = <0x1800 0 0 1 &sic 28
+                         0x1800 0 0 2 &sic 29
+                         0x1800 0 0 3 &sic 30
+                         0x1800 0 0 4 &sic 27
+                         0x1000 0 0 1 &sic 27
+                         0x1000 0 0 2 &sic 28
+                         0x1000 0 0 3 &sic 29
+                         0x1000 0 0 4 &sic 30
+                         0x0800 0 0 1 &sic 30
+                         0x0800 0 0 2 &sic 27
+                         0x0800 0 0 3 &sic 28
+                         0x0800 0 0 4 &sic 29
+                         0x0000 0 0 1 &sic 29
+                         0x0000 0 0 2 &sic 30
+                         0x0000 0 0 3 &sic 27
+                         0x0000 0 0 4 &sic 28>;
+};
diff --git a/Documentation/devicetree/bindings/phy/phy-miphy28lp.txt b/Documentation/devicetree/bindings/phy/phy-miphy28lp.txt
index 46a135dae6b3..89caa885d08c 100644
--- a/Documentation/devicetree/bindings/phy/phy-miphy28lp.txt
+++ b/Documentation/devicetree/bindings/phy/phy-miphy28lp.txt
@@ -26,6 +26,7 @@ Required properties (port (child) node):
                  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.
+- st,syscfg     : Offset of the parent configuration register.
 - resets        : phandle to the parent reset controller.
 - reset-names   : Associated name must be "miphy-sw-rst".
@@ -54,18 +55,12 @@ example:
                        phy_port0: port@9b22000 {
                                reg = <0x9b22000 0xff>,
                                      <0x9b09000 0xff>,
-                                      <0x9b04000 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",
+                                            "pipew";
-                                            "miphy-ctrl-glue",
-                                            "miphy-status-glue",
+                                st,syscfg = <0x114 0x818 0xe0 0xec>;
-                                            "pcie-glue",
-                                            "sata-glue";
                                #phy-cells = <1>;
                                st,osc-rdy;
                                reset-names = "miphy-sw-rst";
@@ -75,18 +70,13 @@ example:
                        phy_port1: port@9b2a000 {
                                reg = <0x9b2a000 0xff>,
                                      <0x9b19000 0xff>,
-                                      <0x9b14000 0xff>,
+                                      <0x9b14000 0xff>;
-                                      <0x118 0x4>,
-                                      <0x81c 0x4>,
-                                      <0xe4  0x4>,
-                                      <0xf0  0x4>;
                                reg-names = "sata-up",
                                            "pcie-up",
-                                            "pipew",
+                                            "pipew";
-                                            "miphy-ctrl-glue",
-                                            "miphy-status-glue",
+                                st,syscfg = <0x118 0x81c 0xe4 0xf0>;
-                                            "pcie-glue",
-                                            "sata-glue";
                                #phy-cells = <1>;
                                st,osc-force-ext;
                                reset-names = "miphy-sw-rst";
@@ -95,13 +85,12 @@ example:
                        phy_port2: port@8f95000 {
                                reg = <0x8f95000 0xff>,
-                                      <0x8f90000 0xff>,
+                                      <0x8f90000 0xff>;
-                                      <0x11c 0x4>,
-                                      <0x820 0x4>;
                                reg-names = "pipew",
-                                    "usb3-up",
+                                            "usb3-up";
-                                    "miphy-ctrl-glue",
-                                    "miphy-status-glue";
+                                st,syscfg = <0x11c 0x820>;
                                #phy-cells = <1>;
                                reset-names = "miphy-sw-rst";
                                resets = <&softreset STIH407_MIPHY2_SOFTRESET>;
@@ -125,4 +114,4 @@ example:
 Macro definitions for the supported miphy configuration can be found in:
-include/dt-bindings/phy/phy-miphy28lp.h
+include/dt-bindings/phy/phy.h
diff --git a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
index 42c880886cf7..9802d5d911aa 100644
--- a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
+++ b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
@@ -6,8 +6,10 @@ for SATA and PCIe.
 Required properties (controller (parent) node):
 - compatible    : Should be "st,miphy365x-phy"
- st,syscfg     : Should be a phandle of the system configuration register group
+- st,syscfg     : Phandle / integer array property. Phandle of sysconfig group
-                  which contain the SATA, PCIe mode setting bits
+                  containing the miphy registers and integer array should contain
+                  an entry for each port sub-node, specifying the control
+                  register offset inside the sysconfig group.
 Required nodes  :  A sub-node is required for each channel the controller
                   provides. Address range information including the usual
@@ -26,7 +28,6 @@ Required properties (port (child) node):
                  registers filled in "reg":
                        - sata:   For SATA devices
                        - pcie:   For PCIe devices
-                        - syscfg: To specify the syscfg based config register
 Optional properties (port (child) node):
 - st,sata-gen        :  Generation of locally attached SATA IP. Expected values
@@ -39,20 +40,20 @@ Example:
        miphy365x_phy: miphy365x@fe382000 {
                compatible      = "st,miphy365x-phy";
-                st,syscfg       = <&syscfg_rear>;
+                st,syscfg       = <&syscfg_rear 0x824 0x828>;
                #address-cells  = <1>;
                #size-cells     = <1>;
                ranges;
                phy_port0: port@fe382000 {
-                        reg = <0xfe382000 0x100>, <0xfe394000 0x100>, <0x824 0x4>;
+                        reg = <0xfe382000 0x100>, <0xfe394000 0x100>;
-                        reg-names = "sata", "pcie", "syscfg";
+                        reg-names = "sata", "pcie";
                        #phy-cells = <1>;
                        st,sata-gen = <3>;
                };
                phy_port1: port@fe38a000 {
-                        reg = <0xfe38a000 0x100>, <0xfe804000 0x100>, <0x828 0x4>;;
+                        reg = <0xfe38a000 0x100>, <0xfe804000 0x100>;;
                        reg-names = "sata", "pcie", "syscfg";
                        #phy-cells = <1>;
                        st,pcie-tx-pol-inv;
diff --git a/Documentation/devicetree/bindings/phy/phy-stih407-usb.txt b/Documentation/devicetree/bindings/phy/phy-stih407-usb.txt
index 1ef8228db73b..de6a706abcdb 100644
--- a/Documentation/devicetree/bindings/phy/phy-stih407-usb.txt
+++ b/Documentation/devicetree/bindings/phy/phy-stih407-usb.txt
@@ -5,10 +5,7 @@ host controllers (when controlling usb2/1.1 devices) available on STiH407 SoC fa
 Required properties:
 - compatible            : should be "st,stih407-usb2-phy"
- reg                   : contain the offset and length of the system configuration registers
+- st,syscfg             : phandle of sysconfig bank plus integer array containing phyparam and phyctrl register offsets
-                          used as glue logic to control & parameter phy
- reg-names             : the names of the system configuration registers in "reg", should be "param" and "reg"
- st,syscfg             : sysconfig register to manage phy parameter at driver level
 - resets                : list of phandle and reset specifier pairs. There should be two entries, one
                          for the whole phy and one for the port
 - reset-names           : list of reset signal names. Should be "global" and "port"
@@ -19,11 +16,8 @@ Example:
 usb2_picophy0: usbpicophy@f8 {
        compatible      = "st,stih407-usb2-phy";
-        reg             = <0xf8 0x04>,  /* syscfg 5062 */
-                          <0xf4 0x04>;  /* syscfg 5061 */
-        reg-names       = "param", "ctrl";
        #phy-cells      = <0>;
-        st,syscfg       = <&syscfg_core>;
+        st,syscfg       = <&syscfg_core 0x100 0xf4>;
        resets          = <&softreset STIH407_PICOPHY_SOFTRESET>,
                          <&picophyreset STIH407_PICOPHY0_RESET>;
        reset-names     = "global", "port";
diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
new file mode 100644
index 000000000000..826454ac43bb
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
@@ -0,0 +1,37 @@
+ROCKCHIP USB2 PHY
+Required properties:
+ - compatible: rockchip,rk3288-usb-phy
+ - rockchip,grf : phandle to the syscon managing the "general
+   register files"
+ - #address-cells: should be 1
+ - #size-cells: should be 0
+Sub-nodes:
+Each PHY should be represented as a sub-node.
+Sub-nodes
+required properties:
+- #phy-cells: should be 0
+- reg: PHY configure reg address offset in GRF
+                "0x320" - for PHY attach to OTG controller
+                "0x334" - for PHY attach to HOST0 controller
+                "0x348" - for PHY attach to HOST1 controller
+Optional Properties:
+- clocks : phandle + clock specifier for the phy clocks
+- clock-names: string, clock name, must be "phyclk"
+Example:
+usbphy: phy {
+        compatible = "rockchip,rk3288-usb-phy";
+        rockchip,grf = <&grf>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        usbphy0: usb-phy0 {
+                #phy-cells = <0>;
+                reg = <0x320>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt
index d5bad920827f..91e38cfe1f8f 100644
--- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
+++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
@@ -3,8 +3,8 @@ Samsung S5P/EXYNOS SoC series MIPI CSIS/DSIM DPHY
 Required properties:
 - compatible : should be "samsung,s5pv210-mipi-video-phy";
- reg : offset and length of the MIPI DPHY register set;
 - #phy-cells : from the generic phy bindings, must be 1;
+- syscon - phandle to the PMU system controller;
 For "samsung,s5pv210-mipi-video-phy" compatible PHYs the second cell in
 the PHY specifier identifies the PHY and its meaning is as follows:
diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
index 93ce12eb422a..fdd8046e650a 100644
--- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
@@ -11,6 +11,7 @@ Required properties:
  "allwinner,sun5i-a10s-pinctrl"
  "allwinner,sun5i-a13-pinctrl"
  "allwinner,sun6i-a31-pinctrl"
+  "allwinner,sun6i-a31s-pinctrl"
  "allwinner,sun6i-a31-r-pinctrl"
  "allwinner,sun7i-a20-pinctrl"
  "allwinner,sun8i-a23-pinctrl"
diff --git a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.txt b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.txt
index 189814e7cdc7..ecb5c0d25218 100644
--- a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.txt
+++ b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.txt
@@ -6,7 +6,8 @@ nvidia,tegra30-pinmux.txt. In fact, this document assumes that binding as
 a baseline, and only documents the differences between the two bindings.
 Required properties:
- compatible: "nvidia,tegra124-pinmux"
+- compatible: For Tegra124, must contain "nvidia,tegra124-pinmux".  For
+  Tegra132, must contain '"nvidia,tegra132-pinmux", "nvidia-tegra124-pinmux"'.
 - reg: Should contain a list of base address and size pairs for:
    -- first entry - the drive strength and pad control registers.
    -- second entry - the pinmux registers
diff --git a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt
index 2f9c0bd66457..30676ded85bb 100644
--- a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt
@@ -13,7 +13,9 @@ how to describe and reference PHYs in device trees.
 Required properties:
 --------------------
- compatible: should be "nvidia,tegra124-xusb-padctl"
+- compatible: For Tegra124, must contain "nvidia,tegra124-xusb-padctl".
+  Otherwise, must contain '"nvidia,<chip>-xusb-padctl",
+  "nvidia-tegra124-xusb-padctl"', where <chip> is tegra132 or tegra210.
 - reg: Physical base address and length of the controller's registers.
 - resets: Must contain an entry for each entry in reset-names.
  See ../reset/reset.txt for details.
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt
new file mode 100644
index 000000000000..498caff6029e
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt
@@ -0,0 +1,186 @@
+Qualcomm MSM8916 TLMM block
+This binding describes the Top Level Mode Multiplexer block found in the
+MSM8916 platform.
+- compatible:
+        Usage: required
+        Value type: <string>
+        Definition: must be "qcom,msm8916-pinctrl"
+- reg:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: the base address and size of the TLMM register space.
+- interrupts:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: should specify the TLMM summary IRQ.
+- interrupt-controller:
+        Usage: required
+        Value type: <none>
+        Definition: identifies this node as an interrupt controller
+- #interrupt-cells:
+        Usage: required
+        Value type: <u32>
+        Definition: must be 2. Specifying the pin number and flags, as defined
+                    in <dt-bindings/interrupt-controller/irq.h>
+- gpio-controller:
+        Usage: required
+        Value type: <none>
+        Definition: identifies this node as a gpio controller
+- #gpio-cells:
+        Usage: required
+        Value type: <u32>
+        Definition: must be 2. Specifying the pin number and flags, as defined
+                    in <dt-bindings/gpio/gpio.h>
+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, 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 pull-up, drive strength, etc.
+PIN CONFIGURATION NODES:
+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:
+                    gpio0-gpio121,
+                    sdc1_clk,
+                    sdc1_cmd,
+                    sdc1_data
+                    sdc2_clk,
+                    sdc2_cmd,
+                    sdc2_data,
+                    qdsd_cmd,
+                    qdsd_data0,
+                    qdsd_data1,
+                    qdsd_data2,
+                    qdsd_data3
+- function:
+        Usage: required
+        Value type: <string>
+        Definition: Specify the alternative function to be configured for the
+                    specified pins. Functions are only valid for gpio pins.
+                    Valid values are:
+        adsp_ext, alsp_int, atest_bbrx0, atest_bbrx1, atest_char, atest_char0,
+        atest_char1, atest_char2, atest_char3, atest_combodac, atest_gpsadc0,
+        atest_gpsadc1, atest_tsens, atest_wlan0, atest_wlan1, backlight_en,
+        bimc_dte0,bimc_dte1, blsp_i2c1, blsp_i2c2, blsp_i2c3, blsp_i2c4,
+        blsp_i2c5, blsp_i2c6, blsp_spi1, blsp_spi1_cs1, blsp_spi1_cs2,
+        blsp_spi1_cs3, blsp_spi2, blsp_spi2_cs1, blsp_spi2_cs2, blsp_spi2_cs3,
+        blsp_spi3, blsp_spi3_cs1, blsp_spi3_cs2, blsp_spi3_cs3, blsp_spi4,
+        blsp_spi5, blsp_spi6, blsp_uart1, blsp_uart2, blsp_uim1, blsp_uim2,
+        cam1_rst, cam1_standby, cam_mclk0, cam_mclk1, cci_async, cci_i2c,
+        cci_timer0, cci_timer1, cci_timer2, cdc_pdm0, codec_mad, dbg_out,
+        display_5v, dmic0_clk, dmic0_data, dsi_rst, ebi0_wrcdc, euro_us,
+        ext_lpass, flash_strobe, gcc_gp1_clk_a, gcc_gp1_clk_b, gcc_gp2_clk_a,
+        gcc_gp2_clk_b, gcc_gp3_clk_a, gcc_gp3_clk_b, gpio, gsm0_tx0, gsm0_tx1,
+        gsm1_tx0, gsm1_tx1, gyro_accl, kpsns0, kpsns1, kpsns2, ldo_en,
+        ldo_update, mag_int, mdp_vsync, modem_tsync, m_voc, nav_pps, nav_tsync,
+        pa_indicator, pbs0, pbs1, pbs2, pri_mi2s, pri_mi2s_ws, prng_rosc,
+        pwr_crypto_enabled_a, pwr_crypto_enabled_b, pwr_modem_enabled_a,
+        pwr_modem_enabled_b, pwr_nav_enabled_a, pwr_nav_enabled_b,
+        qdss_ctitrig_in_a0, qdss_ctitrig_in_a1, qdss_ctitrig_in_b0,
+        qdss_ctitrig_in_b1, qdss_ctitrig_out_a0, qdss_ctitrig_out_a1,
+        qdss_ctitrig_out_b0, qdss_ctitrig_out_b1, qdss_traceclk_a,
+        qdss_traceclk_b, qdss_tracectl_a, qdss_tracectl_b, qdss_tracedata_a,
+        qdss_tracedata_b, reset_n, sd_card, sd_write, sec_mi2s, smb_int,
+        ssbi_wtr0, ssbi_wtr1, uim1, uim2, uim3, uim_batt, wcss_bt, wcss_fm,
+        wcss_wlan, webcam1_rst
+- bias-disable:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins should be configued as no pull.
+- bias-pull-down:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins should be configued as pull down.
+- bias-pull-up:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins should be configued as pull up.
+- output-high:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in output mode, driven
+                    high.
+                    Not valid for sdc pins.
+- output-low:
+        Usage: optional
+        Value type: <none>
+        Definition: The specified pins are configured in output mode, driven
+                    low.
+                    Not valid for sdc pins.
+- drive-strength:
+        Usage: optional
+        Value type: <u32>
+        Definition: Selects the drive strength for the specified pins, in mA.
+                    Valid values are: 2, 4, 6, 8, 10, 12, 14 and 16
+Example:
+        tlmm: pinctrl@1000000 {
+                compatible = "qcom,msm8916-pinctrl";
+                reg = <0x1000000 0x300000>;
+                interrupts = <0 208 0>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+                uart2: uart2-default {
+                        mux {
+                                pins = "gpio4", "gpio5";
+                                function = "blsp_uart2";
+                        };
+                        tx {
+                                pins = "gpio4";
+                                drive-strength = <4>;
+                                bias-disable;
+                        };
+                        rx {
+                                pins = "gpio5";
+                                drive-strength = <2>;
+                                bias-pull-up;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
index daef6fad6a5f..bfe72ec055e3 100644
--- a/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
@@ -1,7 +1,7 @@
 * Renesas Pin Function Controller (GPIO and Pin Mux/Config)
-The Pin Function Controller (PFC) is a Pin Mux/Config controller. On SH7372,
+The Pin Function Controller (PFC) is a Pin Mux/Config controller. On SH73A0,
-SH73A0, R8A73A4 and R8A7740 it also acts as a GPIO controller.
+R8A73A4 and R8A7740 it also acts as a GPIO controller.
 Pin Control
@@ -10,13 +10,13 @@ Pin Control
 Required Properties:
  - compatible: should be one of the following.
+    - "renesas,pfc-emev2": for EMEV2 (EMMA Mobile EV2) compatible pin-controller.
    - "renesas,pfc-r8a73a4": for R8A73A4 (R-Mobile APE6) compatible pin-controller.
    - "renesas,pfc-r8a7740": for R8A7740 (R-Mobile A1) compatible pin-controller.
    - "renesas,pfc-r8a7778": for R8A7778 (R-Mobile M1) compatible pin-controller.
    - "renesas,pfc-r8a7779": for R8A7779 (R-Car H1) compatible pin-controller.
    - "renesas,pfc-r8a7790": for R8A7790 (R-Car H2) compatible pin-controller.
    - "renesas,pfc-r8a7791": for R8A7791 (R-Car M2) compatible pin-controller.
-    - "renesas,pfc-sh7372": for SH7372 (SH-Mobile AP4) compatible pin-controller.
    - "renesas,pfc-sh73a0": for SH73A0 (SH-Mobile AG5) compatible pin-controller.
  - reg: Base address and length of each memory resource used by the pin
@@ -75,8 +75,7 @@ bias-disable, bias-pull-up and bias-pull-down.
 GPIO
 ----
-On SH7372, SH73A0, R8A73A4 and R8A7740 the PFC node is also a GPIO controller
+On SH73A0, R8A73A4 and R8A7740 the PFC node is also a GPIO controller node.
-node.
 Required Properties:
diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
index 8425838a6dff..9d2a995293e6 100644
--- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
@@ -171,6 +171,18 @@ Aliases:
 All the pin controller nodes should be represented in the aliases node using
 the following format 'pinctrl{n}' where n is a unique number for the alias.
+Aliases for controllers compatible with "samsung,exynos7-pinctrl":
+- pinctrl0: pin controller of ALIVE block,
+- pinctrl1: pin controller of BUS0 block,
+- pinctrl2: pin controller of NFC block,
+- pinctrl3: pin controller of TOUCH block,
+- pinctrl4: pin controller of FF block,
+- pinctrl5: pin controller of ESE block,
+- pinctrl6: pin controller of FSYS0 block,
+- pinctrl7: pin controller of FSYS1 block,
+- pinctrl8: pin controller of BUS1 block,
+- pinctrl9: pin controller of AUDIO block,
 Example: A pin-controller node with pin banks:
        pinctrl_0: pinctrl@11400000 {
diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
index 6b33b9f18e88..f63fcb3ed352 100644
--- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
+++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
@@ -16,17 +16,22 @@ 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.
+and processed purely based on their content. The subnodes use the generic
+pin multiplexing node layout from the standard pin control bindings
+(see pinctrl-bindings.txt):
-Required subnode-properties:
+Required pin multiplexing subnode properties:
- ste,pins : An array of strings. Each string contains the name of a pin or
+- function: A string containing the name of the function to mux to the
-    group.
-Optional subnode-properties:
- ste,function: A string containing the name of the function to mux to the
  pin or group.
+- groups : An array of strings. Each string contains the name of a pin
+  group that will be combined with the function to form a multiplexing
+  set-up.
- ste,config: Handle of pin configuration node (e.g. ste,config = <&slpm_in_wkup_pdis>)
+Required pin configuration subnode properties:
+- pins: A string array describing the pins affected by the configuration
+  in the node.
+- ste,config: Handle of pin configuration node
+  (e.g. ste,config = <&slpm_in_wkup_pdis>)
 - ste,input : <0/1/2>
        0: input with no pull
@@ -97,32 +102,32 @@ Example board file extract:
                uart0 {
                        uart0_default_mux: uart0_mux {
                                u0_default_mux {
-                                        ste,function = "u0";
+                                        function = "u0";
-                                        ste,pins = "u0_a_1";
+                                        pins = "u0_a_1";
                                };
                        };
                        uart0_default_mode: uart0_default {
                                uart0_default_cfg1 {
-                                        ste,pins = "GPIO0", "GPIO2";
+                                        pins = "GPIO0", "GPIO2";
                                        ste,input = <1>;
                                };
                                uart0_default_cfg2 {
-                                        ste,pins = "GPIO1", "GPIO3";
+                                        pins = "GPIO1", "GPIO3";
                                        ste,output = <1>;
                                };
                        };
                        uart0_sleep_mode: uart0_sleep {
                                uart0_sleep_cfg1 {
-                                        ste,pins = "GPIO0", "GPIO2";
+                                        pins = "GPIO0", "GPIO2";
                                        ste,config = <&slpm_in_wkup_pdis>;
                                };
                                uart0_sleep_cfg2 {
-                                        ste,pins = "GPIO1";
+                                        pins = "GPIO1";
                                        ste,config = <&slpm_out_hi_wkup_pdis>;
                                };
                                uart0_sleep_cfg3 {
-                                        ste,pins = "GPIO3";
+                                        pins = "GPIO3";
                                        ste,config = <&slpm_out_wkup_pdis>;
                                };
                        };
diff --git a/Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt
new file mode 100644
index 000000000000..b7b55a964f65
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt
@@ -0,0 +1,104 @@
+        Binding for Xilinx Zynq Pinctrl
+Required properties:
+- compatible: "xlnx,zynq-pinctrl"
+- syscon: phandle to SLCR
+- reg: Offset and length of pinctrl space in SLCR
+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".
+Zynq'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 pull-up, slew rate, etc.
+Each configuration node can consist of multiple nodes describing the pinmux and
+pinconf options. Those nodes can be pinmux nodes or pinconf nodes.
+The name of each subnode is not important; all subnodes should be enumerated
+and processed purely based on their content.
+Required properties for pinmux nodes are:
+ - groups: A list of pinmux groups.
+ - function: The name of a pinmux function to activate for the specified set
+   of groups.
+Required properties for configuration nodes:
+One of:
+ - pins: a list of pin names
+ - groups: A list of pinmux groups.
+The following generic properties as defined in pinctrl-bindings.txt are valid
+to specify in a pinmux subnode:
+ groups, function
+The following generic properties as defined in pinctrl-bindings.txt are valid
+to specify in a pinconf subnode:
+ groups, pins, bias-disable, bias-high-impedance, bias-pull-up, slew-rate,
+ low-power-disable, low-power-enable
+ Valid arguments for 'slew-rate' are '0' and '1' to select between slow and fast
+ respectively.
+ Valid values for groups are:
+   ethernet0_0_grp, ethernet1_0_grp, mdio0_0_grp, mdio1_0_grp,
+   qspi0_0_grp, qspi1_0_grp, qspi_fbclk, qspi_cs1_grp, spi0_0_grp,
+   spi0_1_grp - spi0_2_grp, spi1_0_grp - spi1_3_grp, sdio0_0_grp - sdio0_2_grp,
+   sdio1_0_grp - sdio1_3_grp, sdio0_emio_wp, sdio0_emio_cd, sdio1_emio_wp,
+   sdio1_emio_cd, smc0_nor, smc0_nor_cs1_grp, smc0_nor_addr25_grp, smc0_nand,
+   can0_0_grp - can0_10_grp, can1_0_grp - can1_11_grp, uart0_0_grp - uart0_10_grp,
+   uart1_0_grp - uart1_11_grp, i2c0_0_grp - i2c0_10_grp, i2c1_0_grp - i2c1_10_grp,
+   ttc0_0_grp - ttc0_2_grp, ttc1_0_grp - ttc1_2_grp, swdt0_0_grp - swdt0_4_grp,
+   gpio0_0_grp - gpio0_53_grp, usb0_0_grp, usb1_0_grp
+ Valid values for pins are:
+   MIO0 - MIO53
+ Valid values for function are:
+   ethernet0, ethernet1, mdio0, mdio1, qspi0, qspi1, qspi_fbclk, qspi_cs1,
+   spi0, spi1, sdio0, sdio0_pc, sdio0_cd, sdio0_wp,
+   sdio1, sdio1_pc, sdio1_cd, sdio1_wp,
+   smc0_nor, smc0_nor_cs1, smc0_nor_addr25, smc0_nand, can0, can1, uart0, uart1,
+   i2c0, i2c1, ttc0, ttc1, swdt0, gpio0, usb0, usb1
+The following driver-specific properties as defined here are valid to specify in
+a pin configuration subnode:
+ - io-standard: Configure the pin to use the selected IO standard according to
+   this mapping:
+    1: LVCMOS18
+    2: LVCMOS25
+    3: LVCMOS33
+    4: HSTL
+Example:
+        pinctrl0: pinctrl@700 {
+                compatible = "xlnx,pinctrl-zynq";
+                reg = <0x700 0x200>;
+                syscon = <&slcr>;
+                pinctrl_uart1_default: uart1-default {
+                        mux {
+                                groups = "uart1_10_grp";
+                                function = "uart1";
+                        };
+                        conf {
+                                groups = "uart1_10_grp";
+                                slew-rate = <0>;
+                                io-standard = <1>;
+                        };
+                        conf-rx {
+                                pins = "MIO49";
+                                bias-high-impedance;
+                        };
+                        conf-tx {
+                                pins = "MIO48";
+                                bias-disable;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/power/ltc2941.txt b/Documentation/devicetree/bindings/power/ltc2941.txt
new file mode 100644
index 000000000000..ea42ae12d924
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/ltc2941.txt
@@ -0,0 +1,27 @@
+binding for LTC2941 and LTC2943 battery gauges
+Both the LTC2941 and LTC2943 measure battery capacity.
+The LTC2943 is compatible with the LTC2941, it adds voltage and
+temperature monitoring, and uses a slightly different conversion
+formula for the charge counter.
+Required properties:
+- compatible: Should contain "ltc2941" or "ltc2943" which also indicates the
+    type of I2C chip attached.
+- reg: The 7-bit I2C address.
+- lltc,resistor-sense: The sense resistor value in milli-ohms. Can be a 32-bit
+    negative value when the battery has been connected to the wrong end of the
+    resistor.
+- lltc,prescaler-exponent: The prescaler exponent as explained in the datasheet.
+    This determines the range and accuracy of the gauge. The value is programmed
+    into the chip only if it differs from the current setting. The setting is
+    lost when the battery is disconnected.
+Example from the Topic Miami Florida board:
+        fuelgauge: ltc2943@64 {
+                compatible = "ltc2943";
+                reg = <0x64>;
+                lltc,resistor-sense = <15>;
+                lltc,prescaler-exponent = <5>; /* 2^(2*5) = 1024 */
+        };
diff --git a/Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt b/Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt
new file mode 100644
index 000000000000..cc3b1f0a9b1a
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt
@@ -0,0 +1,99 @@
+DT bindings for the Renesas R-Mobile System Controller
+== System Controller Node ==
+The R-Mobile System Controller provides the following functions:
+  - Boot mode management,
+  - Reset generation,
+  - Power management.
+Required properties:
+- compatible: Should be "renesas,sysc-<soctype>", "renesas,sysc-rmobile" as
+              fallback.
+              Examples with soctypes are:
+                - "renesas,sysc-r8a7740" (R-Mobile A1)
+                - "renesas,sysc-sh73a0" (SH-Mobile AG5)
+- reg: Two address start and address range blocks for the device:
+         - The first block refers to the normally accessible registers,
+         - the second block refers to the registers protected by the HPB
+           semaphore.
+Optional nodes:
+- pm-domains: This node contains a hierarchy of PM domain nodes, which should
+  match the Power Area Hierarchy in the Power Domain Specifications section of
+  the device's datasheet.
+== PM Domain Nodes ==
+Each of the PM domain nodes represents a PM domain, as documented by the
+generic PM domain bindings in
+Documentation/devicetree/bindings/power/power_domain.txt.
+The nodes should be named by the real power area names, and thus their names
+should be unique.
+Required properties:
+  - #power-domain-cells: Must be 0.
+Optional properties:
+- reg: If the PM domain is not always-on, this property must contain the bit
+       index number for the corresponding power area in the various Power
+       Control and Status Registers. The parent's node must contain the
+       following two properties:
+         - #address-cells: Must be 1,
+         - #size-cells: Must be 0.
+       If the PM domain is always-on, this property must be omitted.
+Example:
+This shows a subset of the r8a7740 PM domain hierarchy, containing the
+C5 "always-on" domain, 2 of its subdomains (A4S and A4SU), and the A3SP domain,
+which is a subdomain of A4S.
+        sysc: system-controller@e6180000 {
+                compatible = "renesas,sysc-r8a7740", "renesas,sysc-rmobile";
+                reg = <0xe6180000 0x8000>, <0xe6188000 0x8000>;
+                pm-domains {
+                        pd_c5: c5 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                #power-domain-cells = <0>;
+                                pd_a4s: a4s@10 {
+                                        reg = <10>;
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        #power-domain-cells = <0>;
+                                        pd_a3sp: a3sp@11 {
+                                                reg = <11>;
+                                                #power-domain-cells = <0>;
+                                        };
+                                };
+                                pd_a4su: a4su@20 {
+                                        reg = <20>;
+                                        #power-domain-cells = <0>;
+                                };
+                        };
+                };
+        };
+== PM Domain Consumers ==
+Hardware blocks belonging to a PM domain should contain a "power-domains"
+property that is a phandle pointing to the corresponding PM domain node.
+Example:
+        tpu: pwm@e6600000 {
+                compatible = "renesas,tpu-r8a7740", "renesas,tpu";
+                reg = <0xe6600000 0x100>;
+                clocks = <&mstp3_clks R8A7740_CLK_TPU0>;
+                power-domains = <&pd_a3sp>;
+                #pwm-cells = <3>;
+        };
diff --git a/Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt b/Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
index 0c94c637f63b..cd2d7f58a9d7 100644
--- a/Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
+++ b/Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
@@ -1,20 +1,23 @@
 Binding for the LTC2952 PowerPath controller
 This chip is used to externally trigger a system shut down. Once the trigger has
-been sent, the chips' watchdog has to be reset to gracefully shut down.
+been sent, the chip's watchdog has to be reset to gracefully shut down.
-If the Linux systems decides to shut down it powers off the platform via the
+A full powerdown can be triggered via the kill signal.
-kill signal.
 Required properties:
 - compatible:           Must contain: "lltc,ltc2952"
- trigger-gpios:        phandle + gpio-specifier for the GPIO connected to the
-                        chip's trigger line
 - watchdog-gpios:       phandle + gpio-specifier for the GPIO connected to the
                        chip's watchdog line
 - kill-gpios:           phandle + gpio-specifier for the GPIO connected to the
                        chip's kill line
+Optional properties:
+- trigger-gpios:        phandle + gpio-specifier for the GPIO connected to the
+                        chip's trigger line. If this property is not set, the
+                        trigger function is ignored and the chip is kept alive
+                        until an explicit kill signal is received
 Example:
 ltc2952 {
diff --git a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
index 6fbf6e7ecde6..8b70db103ca7 100644
--- a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
+++ b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
@@ -37,7 +37,7 @@ Required properties:
 You specify supplies using the standard regulator bindings by including
-a phandle the the relevant regulator.  All specified supplies must be able
+a phandle the relevant regulator.  All specified supplies must be able
 to report their voltage.  The IO Voltage Domain for any non-specified
 supplies will be not be touched.
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
index edeea160ca39..edda55f74004 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
@@ -7,6 +7,7 @@ CONTENTS
  - FMan MURAM Node
  - FMan dTSEC/XGEC/mEMAC Node
  - FMan IEEE 1588 Node
+  - FMan MDIO Node
  - Example
 =============================================================================
@@ -357,6 +358,69 @@ ptp-timer@fe000 {
 };
 =============================================================================
+FMan MDIO Node
+DESCRIPTION
+The MDIO is a bus to which the PHY devices are connected.
+PROPERTIES
+- compatible
+                Usage: required
+                Value type: <stringlist>
+                Definition: A standard property.
+                Must include "fsl,fman-mdio" for 1 Gb/s MDIO from FMan v2.
+                Must include "fsl,fman-xmdio" for 10 Gb/s MDIO from FMan v2.
+                Must include "fsl,fman-memac-mdio" for 1/10 Gb/s MDIO from
+                FMan v3.
+- reg
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: A standard property.
+- bus-frequency
+                Usage: optional
+                Value type: <u32>
+                Definition: Specifies the external MDIO bus clock speed to
+                be used, if different from the standard 2.5 MHz.
+                This may be due to the standard speed being unsupported (e.g.
+                due to a hardware problem), or to advertise that all relevant
+                components in the system support a faster speed.
+- interrupts
+                Usage: required for external MDIO
+                Value type: <prop-encoded-array>
+                Definition: Event interrupt of external MDIO controller.
+- fsl,fman-internal-mdio
+                Usage: required for internal MDIO
+                Value type: boolean
+                Definition: Fman has internal MDIO for internal PCS(Physical
+                Coding Sublayer) PHYs and external MDIO for external PHYs.
+                The settings and programming routines for internal/external
+                MDIO are different. Must be included for internal MDIO.
+EXAMPLE
+Example for FMan v2 external MDIO:
+mdio@f1000 {
+        compatible = "fsl,fman-xmdio";
+        reg = <0xf1000 0x1000>;
+        interrupts = <101 2 0 0>;
+};
+Example for FMan v3 internal MDIO:
+mdio@f1000 {
+        compatible = "fsl,fman-memac-mdio";
+        reg = <0xf1000 0x1000>;
+        fsl,fman-internal-mdio;
+};
+=============================================================================
 Example
 fman@400000 {
@@ -531,4 +595,10 @@ fman@400000 {
                compatible = "fsl,fman-ptp-timer";
                reg = <0xfe000 0x1000>;
        };
+        mdio@f1000 {
+                compatible = "fsl,fman-xmdio";
+                reg = <0xf1000 0x1000>;
+                interrupts = <101 2 0 0>;
+        };
 };
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/lbc.txt b/Documentation/devicetree/bindings/powerpc/fsl/lbc.txt
index 3300fec501c5..1c80fcedebb5 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/lbc.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/lbc.txt
@@ -16,20 +16,28 @@ Example:
                           "fsl,pq2-localbus";
                #address-cells = <2>;
                #size-cells = <1>;
-                reg = <f0010100 40>;
+                reg = <0xf0010100 0x40>;
-                ranges = <0 0 fe000000 02000000
+                ranges = <0x0 0x0 0xfe000000 0x02000000
-                          1 0 f4500000 00008000>;
+                          0x1 0x0 0xf4500000 0x00008000
+                          0x2 0x0 0xfd810000 0x00010000>;
                flash@0,0 {
                        compatible = "jedec-flash";
-                        reg = <0 0 2000000>;
+                        reg = <0x0 0x0 0x2000000>;
                        bank-width = <4>;
                        device-width = <1>;
                };
                board-control@1,0 {
-                        reg = <1 0 20>;
+                        reg = <0x1 0x0 0x20>;
                        compatible = "fsl,mpc8272ads-bcsr";
                };
+                simple-periph@2,0 {
+                        compatible = "fsl,elbc-gpcm-uio";
+                        reg = <0x2 0x0 0x10000>;
+                        elbc-gpcm-br = <0xfd810800>;
+                        elbc-gpcm-or = <0xffff09f7>;
+                };
        };
diff --git a/Documentation/devicetree/bindings/pwm/img-pwm.txt b/Documentation/devicetree/bindings/pwm/img-pwm.txt
new file mode 100644
index 000000000000..fade5f26fcac
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/img-pwm.txt
@@ -0,0 +1,24 @@
+*Imagination Technologies PWM DAC driver
+Required properties:
+  - compatible: Should be "img,pistachio-pwm"
+  - reg: Should contain physical base address and length of pwm registers.
+  - 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.
+    - pwm: PWM operating clock.
+    - sys: PWM system interface clock.
+  - #pwm-cells: Should be 2. See pwm.txt in this directory for the
+        description of the cells format.
+  - img,cr-periph: Must contain a phandle to the peripheral control
+        syscon node which contains PWM control registers.
+Example:
+        pwm: pwm@18101300 {
+                compatible = "img,pistachio-pwm";
+                reg = <0x18101300 0x100>;
+                clocks = <&pwm_clk>, <&system_clk>;
+                clock-names = "pwm", "sys";
+                #pwm-cells = <2>;
+                img,cr-periph = <&cr_periph>;
+        };
diff --git a/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt b/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt
index c7ea9d4a988b..c52f03b5032f 100644
--- a/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt
+++ b/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt
@@ -1,9 +1,10 @@
 Tegra SoC PWFM controller
 Required properties:
- compatible: should be one of:
+- compatible: For Tegra20, must contain "nvidia,tegra20-pwm".  For Tegra30,
-  - "nvidia,tegra20-pwm"
+  must contain "nvidia,tegra30-pwm".  Otherwise, must contain
-  - "nvidia,tegra30-pwm"
+  "nvidia,<chip>-pwm", plus one of the above, where <chip> is tegra114,
+  tegra124, tegra132, or tegra210.
 - reg: physical base address and length of the controller's registers
 - #pwm-cells: should be 2. See pwm.txt in this directory for a description of
  the cells format.
diff --git a/Documentation/devicetree/bindings/pwm/pwm-sun4i.txt b/Documentation/devicetree/bindings/pwm/pwm-sun4i.txt
new file mode 100644
index 000000000000..ae0273e19506
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/pwm-sun4i.txt
@@ -0,0 +1,20 @@
+Allwinner sun4i and sun7i SoC PWM controller
+Required properties:
+  - compatible: should be one of:
+    - "allwinner,sun4i-a10-pwm"
+    - "allwinner,sun7i-a20-pwm"
+  - reg: physical base address and length of the controller's registers
+  - #pwm-cells: should be 3. See pwm.txt in this directory for a description of
+    the cells format.
+  - clocks: From common clock binding, handle to the parent clock.
+Example:
+        pwm: pwm@01c20e00 {
+                compatible = "allwinner,sun7i-a20-pwm";
+                reg = <0x01c20e00 0xc>;
+                clocks = <&osc24M>;
+                #pwm-cells = <3>;
+                status = "disabled";
+        };
diff --git a/Documentation/devicetree/bindings/regulator/da9211.txt b/Documentation/devicetree/bindings/regulator/da9211.txt
index 240019a82f9a..eb618907c7de 100644
--- a/Documentation/devicetree/bindings/regulator/da9211.txt
+++ b/Documentation/devicetree/bindings/regulator/da9211.txt
@@ -11,6 +11,7 @@ Required properties:
  BUCKA and BUCKB.
 Optional properties:
+- enable-gpios: platform gpio for control of BUCKA/BUCKB.
 - Any optional property defined in regulator.txt
 Example 1) DA9211
@@ -27,6 +28,7 @@ Example 1) DA9211
                                regulator-max-microvolt = <1570000>;
                                regulator-min-microamp  = <2000000>;
                                regulator-max-microamp  = <5000000>;
+                                enable-gpios = <&gpio 27 0>;
                        };
                        BUCKB {
                                regulator-name = "VBUCKB";
@@ -34,11 +36,12 @@ Example 1) DA9211
                                regulator-max-microvolt = <1570000>;
                                regulator-min-microamp  = <2000000>;
                                regulator-max-microamp  = <5000000>;
+                                enable-gpios = <&gpio 17 0>;
                        };
                };
        };
-Example 2) DA92113
+Example 2) DA9213
        pmic: da9213@68 {
                compatible = "dlg,da9213";
                reg = <0x68>;
@@ -51,6 +54,7 @@ Example 2) DA92113
                                regulator-max-microvolt = <1570000>;
                                regulator-min-microamp  = <3000000>;
                                regulator-max-microamp  = <6000000>;
+                                enable-gpios = <&gpio 27 0>;
                        };
                        BUCKB {
                                regulator-name = "VBUCKB";
@@ -58,6 +62,7 @@ Example 2) DA92113
                                regulator-max-microvolt = <1570000>;
                                regulator-min-microamp  = <3000000>;
                                regulator-max-microamp  = <6000000>;
+                                enable-gpios = <&gpio 17 0>;
                        };
                };
        };
diff --git a/Documentation/devicetree/bindings/regulator/isl9305.txt b/Documentation/devicetree/bindings/regulator/isl9305.txt
index a626fc1bbf0d..d6e7c9ec9413 100644
--- a/Documentation/devicetree/bindings/regulator/isl9305.txt
+++ b/Documentation/devicetree/bindings/regulator/isl9305.txt
@@ -2,7 +2,7 @@ Intersil ISL9305/ISL9305H voltage regulator
 Required properties:
- compatible: "isl,isl9305" or "isl,isl9305h"
+- compatible: "isil,isl9305" or "isil,isl9305h"
 - reg: I2C slave address, usually 0x68.
 - regulators: A node that houses a sub-node for each regulator within the
  device. Each sub-node is identified using the node's name, with valid
@@ -19,7 +19,7 @@ Optional properties:
 Example
        pmic: isl9305@68 {
-                compatible = "isl,isl9305";
+                compatible = "isil,isl9305";
                reg = <0x68>;
                VINDCD1-supply = <&system_power>;
diff --git a/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt b/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
new file mode 100644
index 000000000000..a42b1d6e9863
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
@@ -0,0 +1,217 @@
+Mediatek MT6397 Regulator Driver
+Required properties:
+- compatible: "mediatek,mt6397-regulator"
+- mt6397regulator: List of regulators provided by this controller. It is named
+  according to its regulator type, buck_<name> and ldo_<name>.
+  The definition for each of these nodes is defined using the standard binding
+  for regulators at Documentation/devicetree/bindings/regulator/regulator.txt.
+The valid names for regulators are::
+BUCK:
+  buck_vpca15, buck_vpca7, buck_vsramca15, buck_vsramca7, buck_vcore, buck_vgpu,
+  buck_vdrm, buck_vio18
+LDO:
+  ldo_vtcxo, ldo_va28, ldo_vcama, ldo_vio28, ldo_vusb, ldo_vmc, ldo_vmch,
+  ldo_vemc3v3, ldo_vgp1, ldo_vgp2, ldo_vgp3, ldo_vgp4, ldo_vgp5, ldo_vgp6,
+  ldo_vibr
+Example:
+        pmic {
+                compatible = "mediatek,mt6397";
+                mt6397regulator: mt6397regulator {
+                        compatible = "mediatek,mt6397-regulator";
+                        mt6397_vpca15_reg: buck_vpca15 {
+                                regulator-compatible = "buck_vpca15";
+                                regulator-name = "vpca15";
+                                regulator-min-microvolt = < 850000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-ramp-delay = <12500>;
+                                regulator-enable-ramp-delay = <200>;
+                        };
+                        mt6397_vpca7_reg: buck_vpca7 {
+                                regulator-compatible = "buck_vpca7";
+                                regulator-name = "vpca7";
+                                regulator-min-microvolt = < 850000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-ramp-delay = <12500>;
+                                regulator-enable-ramp-delay = <115>;
+                        };
+                        mt6397_vsramca15_reg: buck_vsramca15 {
+                                regulator-compatible = "buck_vsramca15";
+                                regulator-name = "vsramca15";
+                                regulator-min-microvolt = < 850000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-ramp-delay = <12500>;
+                                regulator-enable-ramp-delay = <115>;
+                        };
+                        mt6397_vsramca7_reg: buck_vsramca7 {
+                                regulator-compatible = "buck_vsramca7";
+                                regulator-name = "vsramca7";
+                                regulator-min-microvolt = < 850000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-ramp-delay = <12500>;
+                                regulator-enable-ramp-delay = <115>;
+                        };
+                        mt6397_vcore_reg: buck_vcore {
+                                regulator-compatible = "buck_vcore";
+                                regulator-name = "vcore";
+                                regulator-min-microvolt = < 850000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-ramp-delay = <12500>;
+                                regulator-enable-ramp-delay = <115>;
+                        };
+                        mt6397_vgpu_reg: buck_vgpu {
+                                regulator-compatible = "buck_vgpu";
+                                regulator-name = "vgpu";
+                                regulator-min-microvolt = < 700000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-ramp-delay = <12500>;
+                                regulator-enable-ramp-delay = <115>;
+                        };
+                        mt6397_vdrm_reg: buck_vdrm {
+                                regulator-compatible = "buck_vdrm";
+                                regulator-name = "vdrm";
+                                regulator-min-microvolt = < 800000>;
+                                regulator-max-microvolt = <1400000>;
+                                regulator-ramp-delay = <12500>;
+                                regulator-enable-ramp-delay = <500>;
+                        };
+                        mt6397_vio18_reg: buck_vio18 {
+                                regulator-compatible = "buck_vio18";
+                                regulator-name = "vio18";
+                                regulator-min-microvolt = <1500000>;
+                                regulator-max-microvolt = <2120000>;
+                                regulator-ramp-delay = <12500>;
+                                regulator-enable-ramp-delay = <500>;
+                        };
+                        mt6397_vtcxo_reg: ldo_vtcxo {
+                                regulator-compatible = "ldo_vtcxo";
+                                regulator-name = "vtcxo";
+                                regulator-min-microvolt = <2800000>;
+                                regulator-max-microvolt = <2800000>;
+                                regulator-enable-ramp-delay = <90>;
+                        };
+                        mt6397_va28_reg: ldo_va28 {
+                                regulator-compatible = "ldo_va28";
+                                regulator-name = "va28";
+                                /* fixed output 2.8 V */
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vcama_reg: ldo_vcama {
+                                regulator-compatible = "ldo_vcama";
+                                regulator-name = "vcama";
+                                regulator-min-microvolt = <1500000>;
+                                regulator-max-microvolt = <2800000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vio28_reg: ldo_vio28 {
+                                regulator-compatible = "ldo_vio28";
+                                regulator-name = "vio28";
+                                /* fixed output 2.8 V */
+                                regulator-enable-ramp-delay = <240>;
+                        };
+                        mt6397_usb_reg: ldo_vusb {
+                                regulator-compatible = "ldo_vusb";
+                                regulator-name = "vusb";
+                                /* fixed output 3.3 V */
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vmc_reg: ldo_vmc {
+                                regulator-compatible = "ldo_vmc";
+                                regulator-name = "vmc";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vmch_reg: ldo_vmch {
+                                regulator-compatible = "ldo_vmch";
+                                regulator-name = "vmch";
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vemc_3v3_reg: ldo_vemc3v3 {
+                                regulator-compatible = "ldo_vemc3v3";
+                                regulator-name = "vemc_3v3";
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vgp1_reg: ldo_vgp1 {
+                                regulator-compatible = "ldo_vgp1";
+                                regulator-name = "vcamd";
+                                regulator-min-microvolt = <1220000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <240>;
+                        };
+                        mt6397_vgp2_reg: ldo_vgp2 {
+                                egulator-compatible = "ldo_vgp2";
+                                regulator-name = "vcamio";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vgp3_reg: ldo_vgp3 {
+                                regulator-compatible = "ldo_vgp3";
+                                regulator-name = "vcamaf";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vgp4_reg: ldo_vgp4 {
+                                regulator-compatible = "ldo_vgp4";
+                                regulator-name = "vgp4";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vgp5_reg: ldo_vgp5 {
+                                regulator-compatible = "ldo_vgp5";
+                                regulator-name = "vgp5";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vgp6_reg: ldo_vgp6 {
+                                regulator-compatible = "ldo_vgp6";
+                                regulator-name = "vgp6";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                        mt6397_vibr_reg: ldo_vibr {
+                                regulator-compatible = "ldo_vibr";
+                                regulator-name = "vibr";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-enable-ramp-delay = <218>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/regulator/pfuze100.txt b/Documentation/devicetree/bindings/regulator/pfuze100.txt
index 34ef5d16d0f1..9b40db88f637 100644
--- a/Documentation/devicetree/bindings/regulator/pfuze100.txt
+++ b/Documentation/devicetree/bindings/regulator/pfuze100.txt
@@ -1,7 +1,7 @@
 PFUZE100 family of regulators
 Required properties:
- compatible: "fsl,pfuze100" or "fsl,pfuze200"
+- compatible: "fsl,pfuze100", "fsl,pfuze200", "fsl,pfuze3000"
 - reg: I2C slave address
 Required child node:
@@ -14,6 +14,8 @@ Required child node:
  sw1ab,sw1c,sw2,sw3a,sw3b,sw4,swbst,vsnvs,vrefddr,vgen1~vgen6
  --PFUZE200
  sw1ab,sw2,sw3a,sw3b,swbst,vsnvs,vrefddr,vgen1~vgen6
+  --PFUZE3000
+  sw1a,sw1b,sw2,sw3,swbst,vsnvs,vrefddr,vldo1,vldo2,vccsd,v33,vldo3,vldo4
 Each regulator is defined using the standard binding for regulators.
@@ -205,3 +207,93 @@ Example 2: PFUZE200
                        };
                };
        };
+Example 3: PFUZE3000
+        pmic: pfuze3000@08 {
+                compatible = "fsl,pfuze3000";
+                reg = <0x08>;
+                regulators {
+                        sw1a_reg: sw1a {
+                                regulator-min-microvolt = <700000>;
+                                regulator-max-microvolt = <1475000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                                regulator-ramp-delay = <6250>;
+                        };
+                        /* use sw1c_reg to align with pfuze100/pfuze200 */
+                        sw1c_reg: sw1b {
+                                regulator-min-microvolt = <700000>;
+                                regulator-max-microvolt = <1475000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                                regulator-ramp-delay = <6250>;
+                        };
+                        sw2_reg: sw2 {
+                                regulator-min-microvolt = <2500000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        sw3a_reg: sw3 {
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <1650000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        swbst_reg: swbst {
+                                regulator-min-microvolt = <5000000>;
+                                regulator-max-microvolt = <5150000>;
+                        };
+                        snvs_reg: vsnvs {
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        vref_reg: vrefddr {
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        vgen1_reg: vldo1 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+                        vgen2_reg: vldo2 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <1550000>;
+                        };
+                        vgen3_reg: vccsd {
+                                regulator-min-microvolt = <2850000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+                        vgen4_reg: v33 {
+                                regulator-min-microvolt = <2850000>;
+                                regulator-max-microvolt = <3300000>;
+                        };
+                        vgen5_reg: vldo3 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+                        vgen6_reg: vldo4 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/rtc/armada-380-rtc.txt b/Documentation/devicetree/bindings/rtc/armada-380-rtc.txt
new file mode 100644
index 000000000000..2eb9d4ee7dc0
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/armada-380-rtc.txt
@@ -0,0 +1,22 @@
+* Real Time Clock of the Armada 38x SoCs
+RTC controller for the Armada 38x SoCs
+Required properties:
+- compatible : Should be "marvell,armada-380-rtc"
+- reg: a list of base address and size pairs, one for each entry in
+  reg-names
+- reg names: should contain:
+  * "rtc" for the RTC registers
+  * "rtc-soc" for the SoC related registers and among them the one
+    related to the interrupt.
+- interrupts: IRQ line for the RTC.
+Example:
+rtc@a3800 {
+        compatible = "marvell,armada-380-rtc";
+        reg = <0xa3800 0x20>, <0x184a0 0x0c>;
+        reg-names = "rtc", "rtc-soc";
+        interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+};
diff --git a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt
new file mode 100644
index 000000000000..501c39ceae79
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt
@@ -0,0 +1,78 @@
+Intersil ISL12057 I2C RTC/Alarm chip
+ISL12057 is a trivial I2C device (it has simple device tree bindings,
+consisting of a compatible field, an address and possibly an interrupt
+line).
+Nonetheless, it also supports an option boolean property
+("isil,irq2-can-wakeup-machine") to handle the specific use-case found
+on at least three in-tree users of the chip (NETGEAR ReadyNAS 102, 104
+and 2120 ARM-based NAS); On those devices, the IRQ#2 pin of the chip
+(associated with the alarm supported by the driver) is not connected
+to the SoC but to a PMIC. It allows the device to be powered up when
+RTC alarm rings. In order to mark the device has a wakeup source and
+get access to the 'wakealarm' sysfs entry, this specific property can
+be set when the IRQ#2 pin of the chip is not connected to the SoC but
+can wake up the device.
+Required properties supported by the device:
+ - "compatible": must be "isil,isl12057"
+ - "reg": I2C bus address of the device
+Optional properties:
+ - "isil,irq2-can-wakeup-machine": mark the chip as a wakeup source,
+   independently of the availability of an IRQ line connected to the
+   SoC.
+ - "interrupt-parent", "interrupts": for passing the interrupt line
+   of the SoC connected to IRQ#2 of the RTC chip.
+Example isl12057 node without IRQ#2 pin connected (no alarm support):
+        isl12057: isl12057@68 {
+                compatible = "isil,isl12057";
+                reg = <0x68>;
+        };
+Example isl12057 node with IRQ#2 pin connected to main SoC via MPP6 (note
+that the pinctrl-related properties below are given for completeness and
+may not be required or may be different depending on your system or
+SoC, and the main function of the MPP used as IRQ line, i.e.
+"interrupt-parent" and "interrupts" are usually sufficient):
+                    pinctrl {
+                                ...
+                                rtc_alarm_pin: rtc_alarm_pin {
+                                        marvell,pins = "mpp6";
+                                        marvell,function = "gpio";
+                                };
+                                ...
+                    };
+        ...
+        isl12057: isl12057@68 {
+                compatible = "isil,isl12057";
+                reg = <0x68>;
+                pinctrl-0 = <&rtc_alarm_pin>;
+                pinctrl-names = "default";
+                interrupt-parent = <&gpio0>;
+                interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
+        };
+Example isl12057 node without IRQ#2 pin connected to the SoC but to a
+PMIC, allowing the device to be started based on configured alarm:
+        isl12057: isl12057@68 {
+                compatible = "isil,isl12057";
+                reg = <0x68>;
+                isil,irq2-can-wakeup-machine;
+        };
diff --git a/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt b/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
index 652d1ff2e8be..b7d98ed3e098 100644
--- a/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
+++ b/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
@@ -6,7 +6,9 @@ state.
 Required properties:
- compatible : should be "nvidia,tegra20-rtc".
+- compatible : For Tegra20, must contain "nvidia,tegra20-rtc".  Otherwise,
+  must contain '"nvidia,<chip>-rtc", "nvidia,tegra20-rtc"', where <chip>
+  can be tegra30, tegra114, tegra124, or tegra132.
 - reg : Specifies base physical address and size of the registers.
 - interrupts : A single interrupt specifier.
 - clocks : Must contain one entry, for the module clock.
diff --git a/Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt b/Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt
new file mode 100644
index 000000000000..5cbc0b145a61
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt
@@ -0,0 +1,16 @@
+NXP PCF2123 SPI Real Time Clock
+Required properties:
+- compatible: should be: "nxp,rtc-pcf2123"
+- reg: should be the SPI slave chipselect address
+Optional properties:
+- spi-cs-high: PCF2123 needs chipselect high
+Example:
+rtc: nxp,rtc-pcf2123@3 {
+        compatible = "nxp,rtc-pcf2123"
+        reg = <3>
+        spi-cs-high;
+};
diff --git a/Documentation/devicetree/bindings/security/tpm/st33zp24-i2c.txt b/Documentation/devicetree/bindings/security/tpm/st33zp24-i2c.txt
new file mode 100644
index 000000000000..3ad115efed1e
--- /dev/null
+++ b/Documentation/devicetree/bindings/security/tpm/st33zp24-i2c.txt
@@ -0,0 +1,36 @@
+* STMicroelectronics SAS. ST33ZP24 TPM SoC
+Required properties:
+- compatible: Should be "st,st33zp24-i2c".
+- clock-frequency: I²C work frequency.
+- reg: address on the bus
+Optional ST33ZP24 Properties:
+- interrupt-parent: phandle for the interrupt gpio controller
+- interrupts: GPIO interrupt to which the chip is connected
+- lpcpd-gpios: Output GPIO pin used for ST33ZP24 power management D1/D2 state.
+If set, power must be present when the platform is going into sleep/hibernate mode.
+Optional SoC Specific Properties:
+- pinctrl-names: Contains only one value - "default".
+- pintctrl-0: Specifies the pin control groups used for this controller.
+Example (for ARM-based BeagleBoard xM with ST33ZP24 on I2C2):
+&i2c2 {
+        status = "okay";
+        st33zp24: st33zp24@13 {
+                compatible = "st,st33zp24-i2c";
+                reg = <0x13>;
+                clock-frequency = <400000>;
+                interrupt-parent = <&gpio5>;
+                interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
+                lpcpd-gpios = <&gpio5 15 GPIO_ACTIVE_HIGH>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/serial/digicolor-usart.txt b/Documentation/devicetree/bindings/serial/digicolor-usart.txt
new file mode 100644
index 000000000000..2d3ede66889d
--- /dev/null
+++ b/Documentation/devicetree/bindings/serial/digicolor-usart.txt
@@ -0,0 +1,27 @@
+Binding for Conexant Digicolor USART
+Note: this binding is only applicable for using the USART peripheral as
+UART. USART also support synchronous serial protocols like SPI and I2S. Use
+the binding that matches the wiring of your system.
+Required properties:
+- compatible : should be "cnxt,cx92755-usart".
+- reg: Should contain USART controller registers location and length.
+- interrupts: Should contain a single USART controller interrupt.
+- clocks: Must contain phandles to the USART clock
+  See ../clocks/clock-bindings.txt for details.
+Note: Each UART port should have an alias correctly numbered
+in "aliases" node.
+Example:
+        aliases {
+                serial0 = &uart0;
+        };
+        uart0: uart@f0000740 {
+                compatible = "cnxt,cx92755-usart";
+                reg = <0xf0000740 0x20>;
+                clocks = <&main_clk>;
+                interrupts = <44>;
+        };
diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt
index 48358a33ea7d..44152261e5c5 100644
--- a/Documentation/devicetree/bindings/serial/mtk-uart.txt
+++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt
@@ -2,9 +2,13 @@
 Required properties:
 - compatible should contain:
+  * "mediatek,mt8135-uart" for MT8135 compatible UARTS
+  * "mediatek,mt8127-uart" for MT8127 compatible UARTS
+  * "mediatek,mt8173-uart" for MT8173 compatible UARTS
  * "mediatek,mt6589-uart" for MT6589 compatible UARTS
  * "mediatek,mt6582-uart" for MT6582 compatible UARTS
-  * "mediatek,mt6577-uart" for all compatible UARTS (MT6589, MT6582, MT6577)
+  * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6589, MT6582, 
+        MT6577)
 - reg: The base address of the UART register bank.
diff --git a/Documentation/devicetree/bindings/serial/of-serial.txt b/Documentation/devicetree/bindings/serial/of-serial.txt
index b52b98234b9b..91d5ab0e60fc 100644
--- a/Documentation/devicetree/bindings/serial/of-serial.txt
+++ b/Documentation/devicetree/bindings/serial/of-serial.txt
@@ -8,7 +8,10 @@ Required properties:
        - "ns16550"
        - "ns16750"
        - "ns16850"
-        - "nvidia,tegra20-uart"
+        - For Tegra20, must contain "nvidia,tegra20-uart"
+        - For other Tegra, must contain '"nvidia,<chip>-uart",
+          "nvidia,tegra20-uart"' where <chip> is tegra30, tegra114, tegra124,
+          tegra132, or tegra210.
        - "nxp,lpc3220-uart"
        - "ralink,rt2880-uart"
        - "ibm,qpace-nwp-serial"
@@ -16,6 +19,7 @@ Required properties:
        - "altr,16550-FIFO64"
        - "altr,16550-FIFO128"
        - "fsl,16550-FIFO64"
+        - "fsl,ns16550"
        - "serial" if the port type is unknown.
 - reg : offset and length of the register set for the device.
 - interrupts : should contain uart interrupt.
@@ -40,6 +44,17 @@ Optional properties:
  driver is allowed to detect support for the capability even without this
  property.
+Note:
+* fsl,ns16550:
+  ------------
+  Freescale DUART is very similar to the PC16552D (and to a
+  pair of NS16550A), albeit with some nonstandard behavior such as
+  erratum A-004737 (relating to incorrect BRK handling).
+  Represents a single port that is compatible with the DUART found
+  on many Freescale chips (examples include mpc8349, mpc8548,
+  mpc8641d, p4080 and ls2085a).
 Example:
        uart@80230000 {
diff --git a/Documentation/devicetree/bindings/serial/sirf-uart.txt b/Documentation/devicetree/bindings/serial/sirf-uart.txt
index 3acdd969edf1..f0c39261c5d4 100644
--- a/Documentation/devicetree/bindings/serial/sirf-uart.txt
+++ b/Documentation/devicetree/bindings/serial/sirf-uart.txt
@@ -2,7 +2,7 @@
 Required properties:
 - compatible : Should be "sirf,prima2-uart", "sirf, prima2-usp-uart",
-                "sirf,marco-uart" or "sirf,marco-bt-uart" which means
+                "sirf,atlas7-uart" or "sirf,atlas7-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
@@ -37,7 +37,7 @@ usp@b0090000 {
 for uart use in BT module,
 uart6: uart@11000000 {
        cell-index = <6>;
-        compatible = "sirf,marco-bt-uart", "sirf,marco-uart";
+        compatible = "sirf,atlas7-bt-uart", "sirf,atlas7-uart";
        reg = <0x11000000 0x1000>;
        interrupts = <0 100 0>;
        clocks = <&clks 138>, <&clks 140>, <&clks 141>;
diff --git a/Documentation/devicetree/bindings/serial/sprd-uart.txt b/Documentation/devicetree/bindings/serial/sprd-uart.txt
new file mode 100644
index 000000000000..2aff0f22c9fa
--- /dev/null
+++ b/Documentation/devicetree/bindings/serial/sprd-uart.txt
@@ -0,0 +1,7 @@
+* Spreadtrum serial UART
+Required properties:
+- compatible: must be "sprd,sc9836-uart"
+- reg: offset and length of the register set for the device
+- interrupts: exactly one interrupt specifier
+- clocks: phandles to input clocks.
diff --git a/Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt b/Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt
new file mode 100644
index 000000000000..362a76925bcd
--- /dev/null
+++ b/Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt
@@ -0,0 +1,23 @@
+* Device tree bindings for Allwinner A10, A20 PS2 host controller
+A20 PS2 is dual role controller (PS2 host and PS2 device). These bindings are
+for PS2 A10/A20 host controller. IBM compliant IBM PS2 and AT-compatible keyboard
+and mouse can be connected.
+Required properties:
+ - reg             : Offset and length of the register set for the device.
+ - compatible      : Should be as of the following:
+                     - "allwinner,sun4i-a10-ps2"
+ - interrupts      : The interrupt line connected to the PS2.
+ - clocks          : The gate clk connected to the PS2.
+Example:
+        ps20: ps2@0x01c2a000 {
+                compatible = "allwinner,sun4i-a10-ps2";
+                reg = <0x01c2a000 0x400>;
+                interrupts = <0 62 4>;
+                clocks = <&apb1_gates 6>;
+                status = "disabled";
+        };
diff --git a/Documentation/devicetree/bindings/soc/fsl/bman.txt b/Documentation/devicetree/bindings/soc/fsl/bman.txt
index 9f80bf8709ac..47ac834414d8 100644
--- a/Documentation/devicetree/bindings/soc/fsl/bman.txt
+++ b/Documentation/devicetree/bindings/soc/fsl/bman.txt
@@ -36,6 +36,11 @@ are located at offsets 0xbf8 and 0xbfc
        Value type:     <prop-encoded-array>
        Definition:     Standard property. The error interrupt
+- fsl,bman-portals
+        Usage:          Required
+        Value type:     <phandle>
+        Definition:     Phandle to this BMan instance's portals
 - fsl,liodn
        Usage:          See pamu.txt
        Value type:     <prop-encoded-array>
@@ -96,7 +101,7 @@ The example below shows a BMan FBPR dynamic allocation memory node
                bman_fbpr: bman-fbpr {
                        compatible = "fsl,bman-fbpr";
-                        alloc-ranges = <0 0 0xf 0xffffffff>;
+                        alloc-ranges = <0 0 0x10 0>;
                        size = <0 0x1000000>;
                        alignment = <0 0x1000000>;
                };
@@ -104,6 +109,10 @@ The example below shows a BMan FBPR dynamic allocation memory node
 The example below shows a (P4080) BMan CCSR-space node
+        bportals: bman-portals@ff4000000 {
+                ...
+        };
        crypto@300000 {
                ...
                fsl,bman = <&bman, 2>;
@@ -115,6 +124,7 @@ The example below shows a (P4080) BMan CCSR-space node
                reg = <0x31a000 0x1000>;
                interrupts = <16 2 1 2>;
                fsl,liodn = <0x17>;
+                fsl,bman-portals = <&bportals>;
                memory-region = <&bman_fbpr>;
        };
diff --git a/Documentation/devicetree/bindings/soc/fsl/qman.txt b/Documentation/devicetree/bindings/soc/fsl/qman.txt
index 063e3a0b9d04..556ebb8be75d 100644
--- a/Documentation/devicetree/bindings/soc/fsl/qman.txt
+++ b/Documentation/devicetree/bindings/soc/fsl/qman.txt
@@ -38,6 +38,11 @@ are located at offsets 0xbf8 and 0xbfc
        Value type:     <prop-encoded-array>
        Definition:     Standard property. The error interrupt
+- fsl,qman-portals
+        Usage:          Required
+        Value type:     <phandle>
+        Definition:     Phandle to this QMan instance's portals
 - fsl,liodn
        Usage:          See pamu.txt
        Value type:     <prop-encoded-array>
@@ -113,13 +118,13 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes
                qman_fqd: qman-fqd {
                        compatible = "fsl,qman-fqd";
-                        alloc-ranges = <0 0 0xf 0xffffffff>;
+                        alloc-ranges = <0 0 0x10 0>;
                        size = <0 0x400000>;
                        alignment = <0 0x400000>;
                };
                qman_pfdr: qman-pfdr {
                        compatible = "fsl,qman-pfdr";
-                        alloc-ranges = <0 0 0xf 0xffffffff>;
+                        alloc-ranges = <0 0 0x10 0>;
                        size = <0 0x2000000>;
                        alignment = <0 0x2000000>;
                };
@@ -127,6 +132,10 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes
 The example below shows a (P4080) QMan CCSR-space node
+        qportals: qman-portals@ff4200000 {
+                ...
+        };
        clockgen: global-utilities@e1000 {
                ...
                sysclk: sysclk {
@@ -154,6 +163,7 @@ The example below shows a (P4080) QMan CCSR-space node
                reg = <0x318000 0x1000>;
                interrupts = <16 2 1 3>
                fsl,liodn = <0x16>;
+                fsl,qman-portals = <&qportals>;
                memory-region = <&qman_fqd &qman_pfdr>;
                clocks = <&platform_pll 1>;
        };
diff --git a/Documentation/devicetree/bindings/sound/atmel_ac97c.txt b/Documentation/devicetree/bindings/sound/atmel_ac97c.txt
new file mode 100644
index 000000000000..b151bd902ce3
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/atmel_ac97c.txt
@@ -0,0 +1,20 @@
+* Atmel AC97 controller
+Required properties:
+  - compatible: "atmel,at91sam9263-ac97c"
+  - reg: Address and length of the register set for the device
+  - interrupts: Should contain AC97 interrupt
+  - ac97-gpios: Please refer to soc-ac97link.txt, only ac97-reset is used
+Optional properties:
+  - pinctrl-names, pinctrl-0: Please refer to pinctrl-bindings.txt
+Example:
+sound@fffa0000 {
+       compatible = "atmel,at91sam9263-ac97c";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ac97>;
+       reg = <0xfffa0000 0x4000>;
+       interrupts = <18 IRQ_TYPE_LEVEL_HIGH 5>;
+       ac97-gpios = <&pioB 0 0 &pioB 2 0 &pioC 29 GPIO_ACTIVE_LOW>;
+};
diff --git a/Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt b/Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt
new file mode 100644
index 000000000000..befd125d18bb
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt
@@ -0,0 +1,18 @@
+Bindings for I2S controller built into xtfpga Xtensa bitstreams.
+Required properties:
+- compatible: shall be "cdns,xtfpga-i2s".
+- reg: memory region (address and length) with device registers.
+- interrupts: interrupt for the device.
+- clocks: phandle to the clk used as master clock. I2S bus clock
+  is derived from it.
+Examples:
+        i2s0: xtfpga-i2s@0d080000 {
+                #sound-dai-cells = <0>;
+                compatible = "cdns,xtfpga-i2s";
+                reg = <0x0d080000 0x40>;
+                interrupts = <2 1>;
+                clocks = <&cdce706 4>;
+        };
diff --git a/Documentation/devicetree/bindings/sound/designware-i2s.txt b/Documentation/devicetree/bindings/sound/designware-i2s.txt
new file mode 100644
index 000000000000..7bb54247f8e8
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/designware-i2s.txt
@@ -0,0 +1,31 @@
+DesignWare I2S controller
+Required properties:
+ - compatible : Must be "snps,designware-i2s"
+ - reg : Must contain the I2S core's registers location and length
+ - clocks : Pairs of phandle and specifier referencing the controller's
+   clocks. The controller expects one clock: the clock used as the sampling
+   rate reference clock sample.
+ - clock-names : "i2sclk" for the sample rate reference clock.
+ - dmas: Pairs of phandle and specifier for the DMA channels that are used by
+   the core. The core expects one or two dma channels: one for transmit and
+   one for receive.
+ - dma-names : "tx" for the transmit channel, "rx" for the receive channel.
+For more details on the 'dma', 'dma-names', 'clock' and 'clock-names'
+properties please check:
+        * resource-names.txt
+        * clock/clock-bindings.txt
+        * dma/dma.txt
+Example:
+        soc_i2s: i2s@7ff90000 {
+                compatible = "snps,designware-i2s";
+                reg = <0x0 0x7ff90000 0x0 0x1000>;
+                clocks = <&scpi_i2sclk 0>;
+                clock-names = "i2sclk";
+                #sound-dai-cells = <0>;
+                dmas = <&dma0 5>;
+                dma-names = "tx";
+        };
diff --git a/Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt b/Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt
new file mode 100644
index 000000000000..b41433386e2f
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt
@@ -0,0 +1,23 @@
+Ingenic JZ4740 I2S controller
+Required properties:
+- compatible : "ingenic,jz4740-i2s"
+- reg : I2S registers location and length
+- clocks : AIC and I2S PLL clock specifiers.
+- clock-names: "aic" and "i2s"
+- dmas: DMA controller phandle and DMA request line for I2S Tx and Rx channels
+- dma-names: Must be "tx" and "rx"
+Example:
+i2s: i2s@10020000 {
+        compatible = "ingenic,jz4740-i2s";
+        reg = <0x10020000 0x94>;
+        clocks = <&cgu JZ4740_CLK_AIC>, <&cgu JZ4740_CLK_I2SPLL>;
+        clock-names = "aic", "i2s";
+        dmas = <&dma 2>, <&dma 3>;
+        dma-names = "tx", "rx";
+};
diff --git a/Documentation/devicetree/bindings/sound/max98357a.txt b/Documentation/devicetree/bindings/sound/max98357a.txt
new file mode 100644
index 000000000000..a7a149a236e5
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/max98357a.txt
@@ -0,0 +1,14 @@
+Maxim MAX98357A audio DAC
+This node models the Maxim MAX98357A DAC.
+Required properties:
+- compatible   : "maxim,max98357a"
+- sdmode-gpios : GPIO specifier for the GPIO -> DAC SDMODE pin
+Example:
+max98357a {
+        compatible = "maxim,max98357a";
+        sdmode-gpios = <&qcom_pinmux 25 0>;
+};
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt
new file mode 100644
index 000000000000..a4589cda214e
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt
@@ -0,0 +1,67 @@
+NVIDIA Tegra audio complex, with RT5677 CODEC
+Required properties:
+- compatible : "nvidia,tegra-audio-rt5677"
+- 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:
+  - pll_a
+  - pll_a_out0
+  - mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
+- nvidia,model : The user-visible name of this sound complex.
+- nvidia,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 for sources and
+  sinks are the RT5677's pins (as documented in its binding), and the jacks
+  on the board:
+  * Headphone
+  * Speaker
+  * Headset Mic
+  * Internal Mic 1
+  * Internal Mic 2
+- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
+  connected to the CODEC.
+- nvidia,audio-codec : The phandle of the RT5677 audio codec. This binding
+  assumes that AIF1 on the CODEC is connected to Tegra.
+Optional properties:
+- nvidia,hp-det-gpios : The GPIO that detects headphones are plugged in
+- nvidia,hp-en-gpios : The GPIO that enables headphone amplifier
+- nvidia,mic-present-gpios: The GPIO that mic jack is plugged in
+- nvidia,dmic-clk-en-gpios : The GPIO that gates DMIC clock signal
+Example:
+sound {
+        compatible = "nvidia,tegra-audio-rt5677-ryu",
+                "nvidia,tegra-audio-rt5677";
+        nvidia,model = "NVIDIA Tegra Ryu";
+        nvidia,audio-routing =
+                "Headphone", "LOUT2",
+                "Headphone", "LOUT1",
+                "Headset Mic", "MICBIAS1",
+                "IN1P", "Headset Mic",
+                "IN1N", "Headset Mic",
+                "DMIC L1", "Internal Mic 1",
+                "DMIC R1", "Internal Mic 1",
+                "DMIC L2", "Internal Mic 2",
+                "DMIC R2", "Internal Mic 2",
+                "Speaker", "PDM1L",
+                "Speaker", "PDM1R";
+        nvidia,i2s-controller = <&tegra_i2s1>;
+        nvidia,audio-codec = <&rt5677>;
+        nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
+        nvidia,mic-present-gpios = <&gpio TEGRA_GPIO(O, 5) GPIO_ACTIVE_LOW>;
+        nvidia,hp-en-gpios = <&rt5677 1 GPIO_ACTIVE_HIGH>;
+        nvidia,dmic-clk-en-gpios = <&rt5677 2 GPIO_ACTIVE_HIGH>;
+        clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
+                 <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
+                 <&tegra_car TEGRA124_CLK_EXTERN1>;
+        clock-names = "pll_a", "pll_a_out0", "mclk";
+};
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt
index 946e2ac46091..0e9a1895d7fb 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt
@@ -1,7 +1,10 @@
 NVIDIA Tegra30 AHUB (Audio Hub)
 Required properties:
- compatible : "nvidia,tegra30-ahub", "nvidia,tegra114-ahub", etc.
+- compatible : For Tegra30, must contain "nvidia,tegra30-ahub".  For Tegra114,
+  must contain "nvidia,tegra114-ahub".  For Tegra124, must contain
+  "nvidia,tegra124-ahub".  Otherwise, must contain "nvidia,<chip>-ahub",
+  plus at least one of the above, where <chip> is tegra132.
 - reg : Should contain the register physical address and length for each of
  the AHUB's register blocks.
  - Tegra30 requires 2 entries, for the APBIF and AHUB/AUDIO register blocks.
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
index b4730c2822bc..13e2ef496724 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
@@ -1,7 +1,9 @@
 NVIDIA Tegra30 HDA controller
 Required properties:
- compatible : "nvidia,tegra30-hda"
+- compatible : For Tegra30, must contain "nvidia,tegra30-hda".  Otherwise,
+  must contain '"nvidia,<chip>-hda", "nvidia,tegra30-hda"', where <chip> is
+  tegra114, tegra124, or tegra132.
 - reg : Should contain the HDA registers location and length.
 - interrupts : The interrupt from the HDA controller.
 - clocks : Must contain an entry for each required entry in clock-names.
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt
index 0c113ffe3814..38caa936f6f8 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt
@@ -1,7 +1,10 @@
 NVIDIA Tegra30 I2S controller
 Required properties:
- compatible : "nvidia,tegra30-i2s"
+- compatible : For Tegra30, must contain "nvidia,tegra30-i2s".  For Tegra124,
+  must contain "nvidia,tegra124-i2s".  Otherwise, must contain
+  "nvidia,<chip>-i2s" plus at least one of the above, where <chip> is
+  tegra114 or tegra132.
 - reg : Should contain I2S registers location and length
 - clocks : Must contain one entry, for the module clock.
  See ../clocks/clock-bindings.txt for details.
diff --git a/Documentation/devicetree/bindings/sound/pcm512x.txt b/Documentation/devicetree/bindings/sound/pcm512x.txt
index faff75e64573..3aae3b41bd8e 100644
--- a/Documentation/devicetree/bindings/sound/pcm512x.txt
+++ b/Documentation/devicetree/bindings/sound/pcm512x.txt
@@ -5,7 +5,8 @@ on the board).
 Required properties:
-  - compatible : One of "ti,pcm5121" or "ti,pcm5122"
+  - compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141" or
+                 "ti,pcm5142"
  - reg : the I2C address of the device for I2C, the chip select
          number for SPI.
@@ -16,9 +17,16 @@ Required properties:
 Optional properties:
  - clocks : A clock specifier for the clock connected as SCLK.  If this
-    is absent the device will be configured to clock from BCLK.
+    is absent the device will be configured to clock from BCLK.  If pll-in
+    and pll-out are specified in addition to a clock, the device is
+    configured to accept clock input on a specified gpio pin.
-Example:
+  - pll-in, pll-out : gpio pins used to connect the pll using <1>
+    through <6>.  The device will be configured for clock input on the
+    given pll-in pin and PLL output on the given pll-out pin.  An
+    external connection from the pll-out pin to the SCLK pin is assumed.
+Examples:
        pcm5122: pcm5122@4c {
                compatible = "ti,pcm5122";
@@ -28,3 +36,17 @@ Example:
                DVDD-supply = <&reg_1v8>;
                CPVDD-supply = <&reg_3v3>;
        };
+        pcm5142: pcm5142@4c {
+                compatible = "ti,pcm5142";
+                reg = <0x4c>;
+                AVDD-supply = <&reg_3v3_analog>;
+                DVDD-supply = <&reg_1v8>;
+                CPVDD-supply = <&reg_3v3>;
+                clocks = <&sck>;
+                pll-in = <3>;
+                pll-out = <6>;
+        };
diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
index d188296bb6ec..09e0e18591ae 100644
--- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
@@ -33,6 +33,25 @@ Required SoC Specific Properties:
  "iis" is the i2s bus clock and i2s_opclk0, i2s_opclk1 are sources of the root
  clk. i2s0 has internal mux to select the source of root clk and i2s1 and i2s2
  doesn't have any such mux.
+- #clock-cells: should be 1, this property must be present if the I2S device
+  is a clock provider in terms of the common clock bindings, described in
+  ../clock/clock-bindings.txt.
+- clock-output-names: from the common clock bindings, names of the CDCLK
+  I2S output clocks, suggested values are "i2s_cdclk0", "i2s_cdclk1",
+  "i2s_cdclk3" for the I2S0, I2S1, I2S2 devices recpectively.
+There are following clocks available at the I2S device nodes:
+ CLK_I2S_CDCLK    - the CDCLK (CODECLKO) gate clock,
+ CLK_I2S_RCLK_PSR - the RCLK prescaler divider clock (corresponding to the
+                    IISPSR register),
+ CLK_I2S_RCLK_SRC - the RCLKSRC mux clock (corresponding to RCLKSRC bit in
+                    IISMOD register).
+Refer to the SoC datasheet for availability of the above clocks.
+The CLK_I2S_RCLK_PSR and CLK_I2S_RCLK_SRC clocks are usually only available
+in the IIS Multi Audio Interface (I2S0).
+Note: Old DTs may not have the #clock-cells, clock-output-names properties
+and then not use the I2S node as a clock supplier.
 Optional SoC Specific Properties:
@@ -41,6 +60,7 @@ Optional SoC Specific Properties:
 - pinctrl-0: Should specify pin control groups used for this controller.
 - pinctrl-names: Should contain only one value - "default".
 Example:
 i2s0: i2s@03830000 {
@@ -54,6 +74,8 @@ i2s0: i2s@03830000 {
                <&clock_audss EXYNOS_I2S_BUS>,
                <&clock_audss EXYNOS_SCLK_I2S>;
        clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
+        #clock-cells;
+        clock-output-names = "i2s_cdclk0";
        samsung,idma-addr = <0x03000000>;
        pinctrl-names = "default";
        pinctrl-0 = <&i2s0_bus>;
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index c3cba600bf11..73bf314f7240 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -75,6 +75,11 @@ Optional CPU/CODEC subnodes properties:
                                          it can be specified via "clocks" if system has
                                          clock node (= common clock), or "system-clock-frequency"
                                          (if system doens't support common clock)
+                                          If a clock is specified, it is
+                                          enabled with clk_prepare_enable()
+                                          in dai startup() and disabled with
+                                          clk_disable_unprepare() in dai
+                                          shutdown().
 Example 1 - single DAI link:
diff --git a/Documentation/devicetree/bindings/sound/st,sta32x.txt b/Documentation/devicetree/bindings/sound/st,sta32x.txt
new file mode 100644
index 000000000000..255de3ae5b2f
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/st,sta32x.txt
@@ -0,0 +1,92 @@
+STA32X audio CODEC
+The driver for this device only supports I2C.
+Required properties:
+  - compatible: "st,sta32x"
+  - reg: the I2C address of the device for I2C
+  - reset-gpios: a GPIO spec for the reset pin. If specified, it will be
+                 deasserted before communication to the codec starts.
+  - power-down-gpios: a GPIO spec for the power down pin. If specified,
+                      it will be deasserted before communication to the codec
+                      starts.
+  - Vdda-supply: regulator spec, providing 3.3V
+  - Vdd3-supply: regulator spec, providing 3.3V
+  - Vcc-supply: regulator spec, providing 5V - 26V
+Optional properties:
+  -  st,output-conf: number, Selects the output configuration:
+        0: 2-channel (full-bridge) power, 2-channel data-out
+        1: 2 (half-bridge). 1 (full-bridge) on-board power
+        2: 2 Channel (Full-Bridge) Power, 1 Channel FFX
+        3: 1 Channel Mono-Parallel
+        If parameter is missing, mode 0 will be enabled.
+        This property has to be specified as '/bits/ 8' value.
+  -  st,ch1-output-mapping: Channel 1 output mapping
+  -  st,ch2-output-mapping: Channel 2 output mapping
+  -  st,ch3-output-mapping: Channel 3 output mapping
+        0: Channel 1
+        1: Channel 2
+        2: Channel 3
+        If parameter is missing, channel 1 is chosen.
+        This properties have to be specified as '/bits/ 8' values.
+  -  st,thermal-warning-recover:
+        If present, thermal warning recovery is enabled.
+  -  st,thermal-warning-adjustment:
+        If present, thermal warning adjustment is enabled.
+  -  st,fault-detect-recovery:
+        If present, then fault recovery will be enabled.
+  -  st,drop-compensation-ns: number
+        Only required for "st,ffx-power-output-mode" ==
+        "variable-drop-compensation".
+        Specifies the drop compensation in nanoseconds.
+        The value must be in the range of 0..300, and only
+        multiples of 20 are allowed. Default is 140ns.
+  -  st,max-power-use-mpcc:
+        If present, then MPCC bits are used for MPC coefficients,
+        otherwise standard MPC coefficients are used.
+  -  st,max-power-corr:
+        If present, power bridge correction for THD reduction near maximum
+        power output is enabled.
+  -  st,am-reduction-mode:
+        If present, FFX mode runs in AM reduction mode, otherwise normal
+        FFX mode is used.
+  -  st,odd-pwm-speed-mode:
+        If present, PWM speed mode run on odd speed mode (341.3 kHz) on all
+        channels. If not present, normal PWM spped mode (384 kHz) will be used.
+  -  st,invalid-input-detect-mute:
+        If present, automatic invalid input detect mute is enabled.
+Example:
+codec: sta32x@38 {
+        compatible = "st,sta32x";
+        reg = <0x1c>;
+        reset-gpios = <&gpio1 19 0>;
+        power-down-gpios = <&gpio1 16 0>;
+        st,output-conf = /bits/ 8  <0x3>;       // set output to 2-channel
+                                                // (full-bridge) power,
+                                                // 2-channel data-out
+        st,ch1-output-mapping = /bits/ 8 <0>;   // set channel 1 output ch 1
+        st,ch2-output-mapping = /bits/ 8 <0>;   // set channel 2 output ch 1
+        st,ch3-output-mapping = /bits/ 8 <0>;   // set channel 3 output ch 1
+        st,max-power-correction;                // enables power bridge
+                                                // correction for THD reduction
+                                                // near maximum power output
+        st,invalid-input-detect-mute;           // mute if no valid digital
+                                                // audio signal is provided.
+};
diff --git a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
index 5e6040c2c2e9..47a213c411ce 100644
--- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
+++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
@@ -9,6 +9,7 @@ Required properties:
    "ti,tlv320aic33" - TLV320AIC33
    "ti,tlv320aic3007" - TLV320AIC3007
    "ti,tlv320aic3106" - TLV320AIC3106
+    "ti,tlv320aic3104" - TLV320AIC3104
 - reg - <int> -  I2C slave address
@@ -18,6 +19,7 @@ Optional properties:
 - gpio-reset - gpio pin number used for codec reset
 - ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality
+                                    - Not supported on tlv320aic3104
 - ai3x-micbias-vg - MicBias Voltage required.
        1 - MICBIAS output is powered to 2.0V,
        2 - MICBIAS output is powered to 2.5V,
@@ -36,7 +38,13 @@ CODEC output pins:
  * HPLCOM
  * HPRCOM
-CODEC input pins:
+CODEC input pins for TLV320AIC3104:
+  * MIC2L
+  * MIC2R
+  * LINE1L
+  * LINE1R
+CODEC input pins for other compatible codecs:
  * MIC3L
  * MIC3R
  * LINE1L
diff --git a/Documentation/devicetree/bindings/sound/ts3a227e.txt b/Documentation/devicetree/bindings/sound/ts3a227e.txt
index e8bf23eb1803..a836881d9608 100644
--- a/Documentation/devicetree/bindings/sound/ts3a227e.txt
+++ b/Documentation/devicetree/bindings/sound/ts3a227e.txt
@@ -13,6 +13,11 @@ Required properties:
 - interrupt-parent:    The parent interrupt controller
 - interrupts:          Interrupt number for /INT pin from the 227e
+Optional properies:
+ - ti,micbias:   Intended MICBIAS voltage (datasheet section 9.6.7).
+      Select 0/1/2/3/4/5/6/7 to specify MACBIAS voltage
+      2.1V/2.2V/2.3V/2.4V/2.5V/2.6V/2.7V/2.8V
+      Default value is "1" (2.2V).
 Examples:
diff --git a/Documentation/devicetree/bindings/sound/wm8904.txt b/Documentation/devicetree/bindings/sound/wm8904.txt
index e99f4097c83c..66bf261423b9 100644
--- a/Documentation/devicetree/bindings/sound/wm8904.txt
+++ b/Documentation/devicetree/bindings/sound/wm8904.txt
@@ -3,7 +3,7 @@ WM8904 audio CODEC
 This device supports I2C only.
 Required properties:
-  - compatible: "wlf,wm8904"
+  - compatible: "wlf,wm8904" or "wlf,wm8912"
  - reg: the I2C address of the device.
  - clock-names: "mclk"
  - clocks: reference to
diff --git a/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt b/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt
index 7ea701e07dc2..b785976fe98a 100644
--- a/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt
+++ b/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt
@@ -1,7 +1,9 @@
 NVIDIA Tegra114 SPI controller.
 Required properties:
- compatible : should be "nvidia,tegra114-spi".
+- compatible : For Tegra114, must contain "nvidia,tegra114-spi".
+  Otherwise, must contain '"nvidia,<chip>-spi", "nvidia,tegra114-spi"' where
+  <chip> is tegra124, tegra132, or tegra210.
 - reg: Should contain SPI registers location and length.
 - interrupts: Should contain SPI interrupts.
 - clock-names : Must include the following entries:
diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt
index d11c3721e7cd..4c388bb2f0a2 100644
--- a/Documentation/devicetree/bindings/spi/sh-msiof.txt
+++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt
@@ -30,6 +30,22 @@ Optional properties:
                         specifiers, one for transmission, and one for
                         reception.
 - dma-names            : Must contain a list of two DMA names, "tx" and "rx".
+- renesas,dtdl         : delay sync signal (setup) in transmit mode.
+                         Must contain one of the following values:
+                         0   (no bit delay)
+                         50  (0.5-clock-cycle delay)
+                         100 (1-clock-cycle delay)
+                         150 (1.5-clock-cycle delay)
+                         200 (2-clock-cycle delay)
+- renesas,syncdl       : delay sync signal (hold) in transmit mode.
+                         Must contain one of the following values:
+                         0   (no bit delay)
+                         50  (0.5-clock-cycle delay)
+                         100 (1-clock-cycle delay)
+                         150 (1.5-clock-cycle delay)
+                         200 (2-clock-cycle delay)
+                         300 (3-clock-cycle delay)
 Optional properties, deprecated for soctype-specific bindings:
 - renesas,tx-fifo-size : Overrides the default tx fifo size given in words
diff --git a/Documentation/devicetree/bindings/spi/spi-sirf.txt b/Documentation/devicetree/bindings/spi/spi-sirf.txt
new file mode 100644
index 000000000000..4c7adb8f777c
--- /dev/null
+++ b/Documentation/devicetree/bindings/spi/spi-sirf.txt
@@ -0,0 +1,41 @@
+* CSR SiRFprimaII Serial Peripheral Interface
+Required properties:
+- compatible : Should be "sirf,prima2-spi"
+- reg : Offset and length of the register set for the device
+- interrupts : Should contain SPI interrupt
+- resets: phandle to the reset controller asserting this device in
+          reset
+  See ../reset/reset.txt for details.
+- dmas : Must contain an entry for each entry in clock-names.
+  See ../dma/dma.txt for details.
+- dma-names : Must include the following entries:
+  - rx
+  - tx
+- clocks : Must contain an entry for each entry in clock-names.
+  See ../clocks/clock-bindings.txt for details.
+- #address-cells: Number of cells required to define a chip select
+                  address on the SPI bus. Should be set to 1.
+- #size-cells:    Should be zero.
+Optional properties:
+- spi-max-frequency: Specifies maximum SPI clock frequency,
+                     Units - Hz. Definition as per
+                     Documentation/devicetree/bindings/spi/spi-bus.txt
+- cs-gpios:     should specify GPIOs used for chipselects.
+Example:
+spi0: spi@b00d0000 {
+        compatible = "sirf,prima2-spi";
+        reg = <0xb00d0000 0x10000>;
+        interrupts = <15>;
+        dmas = <&dmac1 9>,
+                <&dmac1 4>;
+        dma-names = "rx", "tx";
+        #address-cells = <1>;
+        #size-cells = <0>;
+        clocks = <&clks 19>;
+        resets = <&rstc 26>;
+};
diff --git a/Documentation/devicetree/bindings/spi/spi-st-ssc.txt b/Documentation/devicetree/bindings/spi/spi-st-ssc.txt
new file mode 100644
index 000000000000..fe54959ec957
--- /dev/null
+++ b/Documentation/devicetree/bindings/spi/spi-st-ssc.txt
@@ -0,0 +1,40 @@
+STMicroelectronics SSC (SPI) Controller
+---------------------------------------
+Required properties:
+- compatible    : "st,comms-ssc4-spi"
+- reg           : Offset and length of the device's register set
+- interrupts    : The interrupt specifier
+- clock-names   : Must contain "ssc"
+- clocks        : Must contain an entry for each name in clock-names
+                    See ../clk/*
+- pinctrl-names : Uses "default", can use "sleep" if provided
+                    See ../pinctrl/pinctrl-binding.txt
+Optional properties:
+- cs-gpios      : List of GPIO chip selects
+                    See ../spi/spi-bus.txt
+Child nodes represent devices on the SPI bus
+  See ../spi/spi-bus.txt
+Example:
+        spi@9840000 {
+                compatible      = "st,comms-ssc4-spi";
+                reg             = <0x9840000 0x110>;
+                interrupts      = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+                clocks          = <&clk_s_c0_flexgen CLK_EXT2F_A9>;
+                clock-names     = "ssc";
+                pinctrl-0       = <&pinctrl_spi0_default>;
+                pinctrl-names   = "default";
+                cs-gpios        = <&pio17 5 0>;
+                #address-cells  = <1>;
+                #size-cells     = <0>;
+                st95hf@0{
+                        compatible              = "st,st95hf";
+                        reg                     = <0>;
+                        spi-max-frequency       = <1000000>;
+                        interrupts              = <2 IRQ_TYPE_EDGE_FALLING>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
index ee05dc390694..307537787574 100644
--- a/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
+++ b/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
@@ -12,9 +12,9 @@ Optional properties:
                               property is not present, then the touchscreen is
                               disabled. 5 wires is valid for i.MX28 SoC only.
 - fsl,ave-ctrl: number of samples per direction to calculate an average value.
-                Allowed value is 1 ... 31, default is 4
+                Allowed value is 1 ... 32, default is 4
 - fsl,ave-delay: delay between consecutive samples. Allowed value is
-                 1 ... 2047. It is used if 'fsl,ave-ctrl' > 1, counts at
+                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
                 2 kHz and its default is 2 (= 1 ms)
 - fsl,settling: delay between plate switch to next sample. Allowed value is
                1 ... 2047. It counts at 2 kHz and its default is
diff --git a/Documentation/devicetree/bindings/submitting-patches.txt b/Documentation/devicetree/bindings/submitting-patches.txt
index b7ba01ad1426..56742bc70218 100644
--- a/Documentation/devicetree/bindings/submitting-patches.txt
+++ b/Documentation/devicetree/bindings/submitting-patches.txt
@@ -15,6 +15,29 @@ I. For patch submitters
  3) The Documentation/ portion of the patch should come in the series before
     the code implementing the binding.
+  4) Any compatible strings used in a chip or board DTS file must be
+     previously documented in the corresponding DT binding text file
+     in Documentation/devicetree/bindings.  This rule applies even if
+     the Linux device driver does not yet match on the compatible
+     string.  [ checkpatch will emit warnings if this step is not
+     followed as of commit bff5da4335256513497cc8c79f9a9d1665e09864
+     ("checkpatch: add DT compatible string documentation checks"). ]
+  5) The wildcard "<chip>" may be used in compatible strings, as in
+     the following example:
+         - compatible: Must contain '"nvidia,<chip>-pcie",
+           "nvidia,tegra20-pcie"' where <chip> is tegra30, tegra132, ...
+     As in the above example, the known values of "<chip>" should be
+     documented if it is used.
+  6) If a documented compatible string is not yet matched by the
+     driver, the documentation should also include a compatible
+     string that is matched by the driver (as in the "nvidia,tegra20-pcie"
+     example above).
 II. For kernel maintainers
  1) If you aren't comfortable reviewing a given binding, reply to it and ask
diff --git a/Documentation/devicetree/bindings/thermal/exynos-thermal.txt b/Documentation/devicetree/bindings/thermal/exynos-thermal.txt
index ae738f562acc..695150a4136b 100644
--- a/Documentation/devicetree/bindings/thermal/exynos-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/exynos-thermal.txt
@@ -12,6 +12,7 @@
               "samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4
                        Exynos5420 (Must pass triminfo base and triminfo clock)
               "samsung,exynos5440-tmu"
+               "samsung,exynos7-tmu"
 - interrupt-parent : The phandle for the interrupt controller
 - reg : Address range of the thermal registers. For soc's which has multiple
        instances of TMU and some registers are shared across all TMU's like
@@ -32,13 +33,28 @@
 - clocks : The main clocks for TMU device
        -- 1. operational clock for TMU channel
        -- 2. optional clock to access the shared registers of TMU channel
+        -- 3. optional special clock for functional operation
 - clock-names : Thermal system clock name
        -- "tmu_apbif" operational clock for current TMU channel
        -- "tmu_triminfo_apbif" clock to access the shared triminfo register
                for current TMU channel
+        -- "tmu_sclk" clock for functional operation of the current TMU
+                channel
 - vtmu-supply: This entry is optional and provides the regulator node supplying
                voltage to TMU. If needed this entry can be placed inside
                board/platform specific dts file.
+Following properties are mandatory (depending on SoC):
+- samsung,tmu_gain: Gain value for internal TMU operation.
+- samsung,tmu_reference_voltage: Value of TMU IP block's reference voltage
+- samsung,tmu_noise_cancel_mode: Mode for noise cancellation
+- samsung,tmu_efuse_value: Default level of temperature - it is needed when
+                           in factory fusing produced wrong value
+- samsung,tmu_min_efuse_value: Minimum temperature fused value
+- samsung,tmu_max_efuse_value: Maximum temperature fused value
+- samsung,tmu_first_point_trim: First point trimming value
+- samsung,tmu_second_point_trim: Second point trimming value
+- samsung,tmu_default_temp_offset: Default temperature offset
+- samsung,tmu_cal_type: Callibration type
 Example 1):
@@ -51,6 +67,7 @@ Example 1):
                clock-names = "tmu_apbif";
                status = "disabled";
                vtmu-supply = <&tmu_regulator_node>;
+                #include "exynos4412-tmu-sensor-conf.dtsi"
        };
 Example 2):
@@ -61,6 +78,7 @@ Example 2):
                interrupts = <0 58 0>;
                clocks = <&clock 21>;
                clock-names = "tmu_apbif";
+                #include "exynos5440-tmu-sensor-conf.dtsi"
        };
 Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
@@ -70,6 +88,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
                interrupts = <0 184 0>;
                clocks = <&clock 318>, <&clock 318>;
                clock-names = "tmu_apbif", "tmu_triminfo_apbif";
+                #include "exynos4412-tmu-sensor-conf.dtsi"
        };
        tmu_cpu3: tmu@1006c000 {
@@ -78,6 +97,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
                interrupts = <0 185 0>;
                clocks = <&clock 318>, <&clock 319>;
                clock-names = "tmu_apbif", "tmu_triminfo_apbif";
+                #include "exynos4412-tmu-sensor-conf.dtsi"
        };
        tmu_gpu: tmu@100a0000 {
@@ -86,6 +106,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
                interrupts = <0 215 0>;
                clocks = <&clock 319>, <&clock 318>;
                clock-names = "tmu_apbif", "tmu_triminfo_apbif";
+                #include "exynos4412-tmu-sensor-conf.dtsi"
        };
 Note: For multi-instance tmu each instance should have an alias correctly
diff --git a/Documentation/devicetree/bindings/thermal/tegra-soctherm.txt b/Documentation/devicetree/bindings/thermal/tegra-soctherm.txt
index ecf3ed76cd46..6b68cd150405 100644
--- a/Documentation/devicetree/bindings/thermal/tegra-soctherm.txt
+++ b/Documentation/devicetree/bindings/thermal/tegra-soctherm.txt
@@ -7,7 +7,9 @@ notifications. It is also used to manage emergency shutdown in an
 overheating situation.
 Required properties :
- compatible : "nvidia,tegra124-soctherm".
+- compatible : For Tegra124, must contain "nvidia,tegra124-soctherm".
+  For Tegra132, must contain "nvidia,tegra132-soctherm".
+  For Tegra210, must contain "nvidia,tegra210-soctherm".
 - reg : Should contain 1 entry:
  - SOCTHERM register set
 - interrupts : Defines the interrupt used by SOCTHERM
diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
index f5db6b72a36f..29fe0bfae38e 100644
--- a/Documentation/devicetree/bindings/thermal/thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/thermal.txt
@@ -251,24 +251,24 @@ ocp {
 };
 thermal-zones {
-        cpu-thermal: cpu-thermal {
+        cpu_thermal: cpu-thermal {
                polling-delay-passive = <250>; /* milliseconds */
                polling-delay = <1000>; /* milliseconds */
                thermal-sensors = <&bandgap0>;
                trips {
-                        cpu-alert0: cpu-alert {
+                        cpu_alert0: cpu-alert0 {
                                temperature = <90000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "active";
                        };
-                        cpu-alert1: cpu-alert {
+                        cpu_alert1: cpu-alert1 {
                                temperature = <100000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "passive";
                        };
-                        cpu-crit: cpu-crit {
+                        cpu_crit: cpu-crit {
                                temperature = <125000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "critical";
@@ -277,17 +277,17 @@ thermal-zones {
                cooling-maps {
                        map0 {
-                                trip = <&cpu-alert0>;
+                                trip = <&cpu_alert0>;
-                                cooling-device = <&fan0 THERMAL_NO_LIMITS 4>;
+                                cooling-device = <&fan0 THERMAL_NO_LIMIT 4>;
                        };
                        map1 {
-                                trip = <&cpu-alert1>;
+                                trip = <&cpu_alert1>;
-                                cooling-device = <&fan0 5 THERMAL_NO_LIMITS>;
+                                cooling-device = <&fan0 5 THERMAL_NO_LIMIT>;
                        };
                        map2 {
-                                trip = <&cpu-alert1>;
+                                trip = <&cpu_alert1>;
                                cooling-device =
-                                    <&cpu0 THERMAL_NO_LIMITS THERMAL_NO_LIMITS>;
+                                    <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
                        };
                };
        };
@@ -298,13 +298,13 @@ used to monitor the zone 'cpu-thermal' using its sole sensor. A fan
 device (fan0) is controlled via I2C bus 1, at address 0x48, and has ten
 different cooling states 0-9. It is used to remove the heat out of
 the thermal zone 'cpu-thermal' using its cooling states
-from its minimum to 4, when it reaches trip point 'cpu-alert0'
+from its minimum to 4, when it reaches trip point 'cpu_alert0'
 at 90C, as an example of active cooling. The same cooling device is used at
-'cpu-alert1', but from 5 to its maximum state. The cpu@0 device is also
+'cpu_alert1', but from 5 to its maximum state. The cpu@0 device is also
 linked to the same thermal zone, 'cpu-thermal', as a passive cooling device,
-using all its cooling states at trip point 'cpu-alert1',
+using all its cooling states at trip point 'cpu_alert1',
 which is a trip point at 100C. On the thermal zone 'cpu-thermal', at the
-temperature of 125C, represented by the trip point 'cpu-crit', the silicon
+temperature of 125C, represented by the trip point 'cpu_crit', the silicon
 is not reliable anymore.
 (b) - IC with several internal sensors
@@ -329,7 +329,7 @@ ocp {
 };
 thermal-zones {
-        cpu-thermal: cpu-thermal {
+        cpu_thermal: cpu-thermal {
                polling-delay-passive = <250>; /* milliseconds */
                polling-delay = <1000>; /* milliseconds */
@@ -338,12 +338,12 @@ thermal-zones {
                trips {
                        /* each zone within the SoC may have its own trips */
-                        cpu-alert: cpu-alert {
+                        cpu_alert: cpu-alert {
                                temperature = <100000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "passive";
                        };
-                        cpu-crit: cpu-crit {
+                        cpu_crit: cpu-crit {
                                temperature = <125000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "critical";
@@ -356,7 +356,7 @@ thermal-zones {
                };
        };
-        gpu-thermal: gpu-thermal {
+        gpu_thermal: gpu-thermal {
                polling-delay-passive = <120>; /* milliseconds */
                polling-delay = <1000>; /* milliseconds */
@@ -365,12 +365,12 @@ thermal-zones {
                trips {
                        /* each zone within the SoC may have its own trips */
-                        gpu-alert: gpu-alert {
+                        gpu_alert: gpu-alert {
                                temperature = <90000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "passive";
                        };
-                        gpu-crit: gpu-crit {
+                        gpu_crit: gpu-crit {
                                temperature = <105000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "critical";
@@ -383,7 +383,7 @@ thermal-zones {
                };
        };
-        dsp-thermal: dsp-thermal {
+        dsp_thermal: dsp-thermal {
                polling-delay-passive = <50>; /* milliseconds */
                polling-delay = <1000>; /* milliseconds */
@@ -392,12 +392,12 @@ thermal-zones {
                trips {
                        /* each zone within the SoC may have its own trips */
-                        dsp-alert: gpu-alert {
+                        dsp_alert: dsp-alert {
                                temperature = <90000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "passive";
                        };
-                        dsp-crit: gpu-crit {
+                        dsp_crit: gpu-crit {
                                temperature = <135000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "critical";
@@ -457,7 +457,7 @@ ocp {
 };
 thermal-zones {
-        cpu-thermal: cpu-thermal {
+        cpu_thermal: cpu-thermal {
                polling-delay-passive = <250>; /* milliseconds */
                polling-delay = <1000>; /* milliseconds */
@@ -508,7 +508,7 @@ with many sensors and many cooling devices.
        /*
         * An IC with several temperature sensor.
         */
-        adc-dummy: sensor@0x50 {
+        adc_dummy: sensor@0x50 {
                ...
                #thermal-sensor-cells = <1>; /* sensor internal ID */
        };
@@ -520,7 +520,7 @@ thermal-zones {
                polling-delay = <2500>; /* milliseconds */
                                /* sensor       ID */
-                thermal-sensors = <&adc-dummy     4>;
+                thermal-sensors = <&adc_dummy     4>;
                trips {
                        ...
@@ -531,14 +531,14 @@ thermal-zones {
                };
        };
-        board-thermal: board-thermal {
+        board_thermal: board-thermal {
                polling-delay-passive = <1000>; /* milliseconds */
                polling-delay = <2500>; /* milliseconds */
                                /* sensor       ID */
-                thermal-sensors = <&adc-dummy     0>, /* pcb top edge */
+                thermal-sensors = <&adc_dummy     0>, /* pcb top edge */
-                                  <&adc-dummy     1>, /* lcd */
+                                  <&adc_dummy     1>, /* lcd */
-                                  <&adc-dymmy     2>; /* back cover */
+                                  <&adc_dummy     2>; /* back cover */
                /*
                 * An array of coefficients describing the sensor
                 * linear relation. E.g.:
@@ -548,22 +548,22 @@ thermal-zones {
                trips {
                        /* Trips are based on resulting linear equation */
-                        cpu-trip: cpu-trip {
+                        cpu_trip: cpu-trip {
                                temperature = <60000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "passive";
                        };
-                        gpu-trip: gpu-trip {
+                        gpu_trip: gpu-trip {
                                temperature = <55000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "passive";
                        }
-                        lcd-trip: lcp-trip {
+                        lcd_trip: lcp-trip {
                                temperature = <53000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "passive";
                        };
-                        crit-trip: crit-trip {
+                        crit_trip: crit-trip {
                                temperature = <68000>; /* millicelsius */
                                hysteresis = <2000>; /* millicelsius */
                                type = "critical";
@@ -572,17 +572,17 @@ thermal-zones {
                cooling-maps {
                        map0 {
-                                trip = <&cpu-trip>;
+                                trip = <&cpu_trip>;
                                cooling-device = <&cpu0 0 2>;
                                contribution = <55>;
                        };
                        map1 {
-                                trip = <&gpu-trip>;
+                                trip = <&gpu_trip>;
                                cooling-device = <&gpu0 0 2>;
                                contribution = <20>;
                        };
                        map2 {
-                                trip = <&lcd-trip>;
+                                trip = <&lcd_trip>;
                                cooling-device = <&lcd0 5 10>;
                                contribution = <15>;
                        };
diff --git a/Documentation/devicetree/bindings/timer/digicolor-timer.txt b/Documentation/devicetree/bindings/timer/digicolor-timer.txt
new file mode 100644
index 000000000000..d1b659bbc29f
--- /dev/null
+++ b/Documentation/devicetree/bindings/timer/digicolor-timer.txt
@@ -0,0 +1,18 @@
+Conexant Digicolor SoCs Timer Controller
+Required properties:
+- compatible : should be "cnxt,cx92755-timer"
+- reg : Specifies base physical address and size of the "Agent Communication"
+  timer registers
+- interrupts : Contains 8 interrupts, one for each timer
+- clocks: phandle to the main clock
+Example:
+        timer@f0000fc0 {
+                compatible = "cnxt,cx92755-timer";
+                reg = <0xf0000fc0 0x40>;
+                interrupts = <19>, <31>, <34>, <35>, <52>, <53>, <54>, <55>;
+                clocks = <&main_clk>;
+        };
diff --git a/Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt b/Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
index b5082a1cf461..1761f53ee36f 100644
--- a/Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
+++ b/Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
@@ -6,7 +6,9 @@ trigger a legacy watchdog reset.
 Required properties:
- compatible : should be "nvidia,tegra30-timer", "nvidia,tegra20-timer".
+- compatible : For Tegra30, must contain "nvidia,tegra30-timer".  Otherwise,
+  must contain '"nvidia,<chip>-timer", "nvidia,tegra30-timer"' where
+  <chip> is tegra124 or tegra132.
 - reg : Specifies base physical address and size of the registers.
 - interrupts : A list of 6 interrupts; one per each of timer channels 1
    through 5, and one for the shared interrupt for the remaining channels.
diff --git a/Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt b/Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt
new file mode 100644
index 000000000000..87f0b0042bae
--- /dev/null
+++ b/Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt
@@ -0,0 +1,18 @@
+Rockchip rk3288 timer
+Required properties:
+- compatible: shall be "rockchip,rk3288-timer"
+- reg: base address of the timer register starting with TIMERS CONTROL register
+- interrupts: should contain the interrupts for Timer0
+- clocks : must contain an entry for each entry in clock-names
+- clock-names : must include the following entries:
+  "timer", "pclk"
+Example:
+        timer: timer@ff810000 {
+                compatible = "rockchip,rk3288-timer";
+                reg = <0xff810000 0x20>;
+                interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&xin24m>, <&cru PCLK_TIMER>;
+                clock-names = "timer", "pclk";
+        };
diff --git a/Documentation/devicetree/bindings/unittest.txt b/Documentation/devicetree/bindings/unittest.txt
index 0f92a22fddfa..8933211f32f9 100644
--- a/Documentation/devicetree/bindings/unittest.txt
+++ b/Documentation/devicetree/bindings/unittest.txt
@@ -1,4 +1,4 @@
-* OF selftest platform device
+1) OF selftest platform device
 ** selftest
@@ -12,3 +12,60 @@ Example:
                compatible = "selftest";
                status = "okay";
        };
+2) OF selftest i2c adapter platform device
+** platform device unittest adapter
+Required properties:
+- compatible: must be selftest-i2c-bus
+Children nodes contain selftest i2c devices.
+Example:
+        selftest-i2c-bus {
+                compatible = "selftest-i2c-bus";
+                status = "okay";
+        };
+3) OF selftest i2c device
+** I2C selftest device
+Required properties:
+- compatible: must be selftest-i2c-dev
+All other properties are optional
+Example:
+        selftest-i2c-dev {
+                compatible = "selftest-i2c-dev";
+                status = "okay";
+        };
+4) OF selftest i2c mux device
+** I2C selftest mux
+Required properties:
+- compatible: must be selftest-i2c-mux
+Children nodes contain selftest i2c bus nodes per channel.
+Example:
+        selftest-i2c-mux {
+                compatible = "selftest-i2c-mux";
+                status = "okay";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                channel-0 {
+                        reg = <0>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        i2c-dev {
+                                reg = <8>;
+                                compatible = "selftest-i2c-dev";
+                                status = "okay";
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt
index bc2222ca3f2a..e180d56c75db 100644
--- a/Documentation/devicetree/bindings/usb/atmel-usb.txt
+++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt
@@ -33,9 +33,17 @@ usb1: ehci@00800000 {
 AT91 USB device controller
 Required properties:
- - compatible: Should be "atmel,at91rm9200-udc"
+ - compatible: Should be one of the following
+               "atmel,at91rm9200-udc"
+               "atmel,at91sam9260-udc"
+               "atmel,at91sam9261-udc"
+               "atmel,at91sam9263-udc"
 - reg: Address and length of the register set for the device
 - interrupts: Should contain macb interrupt
+ - clocks: Should reference the peripheral and the AHB clocks
+ - clock-names: Should contains two strings
+                "pclk" for the peripheral clock
+                "hclk" for the AHB clock
 Optional properties:
 - atmel,vbus-gpio: If present, specifies a gpio that needs to be
@@ -51,7 +59,10 @@ usb1: gadget@fffa4000 {
 Atmel High-Speed USB device controller
 Required properties:
- - compatible: Should be "atmel,at91sam9rl-udc"
+ - compatible: Should be one of the following
+               "at91sam9rl-udc"
+               "at91sam9g45-udc"
+               "sama5d3-udc"
 - reg: Address and length of the register set for the device
 - interrupts: Should contain usba interrupt
 - ep childnode: To specify the number of endpoints and their properties.
diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index 482f815363ef..fd132cbee70e 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -20,6 +20,10 @@ Optional properties:
 Refer to phy/phy-bindings.txt for generic phy consumer properties
 - dr_mode: shall be one of "host", "peripheral" and "otg"
  Refer to usb/generic.txt
+- g-use-dma: enable dma usage in gadget driver.
+- g-rx-fifo-size: size of rx fifo size in gadget mode.
+- g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.
+- g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
 Example:
diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
index 3dc9140e3dfb..f60785f73d3d 100644
--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
@@ -6,7 +6,10 @@ Practice : Universal Serial Bus" with the following modifications
 and additions :
 Required properties :
- - compatible : Should be "nvidia,tegra20-ehci".
+ - compatible : For Tegra20, must contain "nvidia,tegra20-ehci".
+   For Tegra30, must contain "nvidia,tegra30-ehci".  Otherwise, must contain
+   "nvidia,<chip>-ehci" plus at least one of the above, where <chip> is
+   tegra114, tegra124, tegra132, or tegra210.
 - nvidia,phy : phandle of the PHY that the controller is connected to.
 - clocks : Must contain one entry, for the module clock.
   See ../clocks/clock-bindings.txt for details.
diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
index c9205fbf26e2..a9aa79fb90ed 100644
--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
@@ -3,7 +3,10 @@ Tegra SOC USB PHY
 The device node for Tegra SOC USB PHY:
 Required properties :
- - compatible : Should be "nvidia,tegra<chip>-usb-phy".
+ - compatible : For Tegra20, must contain "nvidia,tegra20-usb-phy".
+   For Tegra30, must contain "nvidia,tegra30-usb-phy".  Otherwise, must contain
+   "nvidia,<chip>-usb-phy" plus at least one of the above, where <chip> is
+   tegra114, tegra124, tegra132, or tegra210.
 - reg : Defines the following set of registers, in the order listed:
   - The PHY's own register set.
     Always present.
diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
index b08c903f8668..61b045b6d50e 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
@@ -14,6 +14,8 @@ Optional properties:
                         function should be enabled
  - phys: phandle + phy specifier pair
  - phy-names: must be "usb"
+  - dmas: Must contain a list of references to DMA specifiers.
+  - dma-names : Must contain a list of DMA names, "tx" or "rx".
 Example:
        usbhs: usb@e6590000 {
diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt
index 43c1a4e06767..0b04fdff9d5a 100644
--- a/Documentation/devicetree/bindings/usb/usb-ehci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt
@@ -12,6 +12,7 @@ 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
+ - needs-reset-on-resume : boolean, set this to force EHCI reset after resume
 - clocks : a list of phandle + clock specifier pairs
 - phys : phandle + phy specifier pair
 - phy-names : "usb"
diff --git a/Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt b/Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt
index 1bd37faba05b..5be01c859b7a 100644
--- a/Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt
+++ b/Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt
@@ -13,10 +13,15 @@ Optional properties:
 - clock-frequency: the clock frequency (in Hz) that the PHY clock must
  be configured to.
- vcc-supply: phandle to the regulator that provides RESET to the PHY.
+- vcc-supply: phandle to the regulator that provides power to the PHY.
 - reset-gpios: Should specify the GPIO for reset.
+- vbus-detect-gpio: should specify the GPIO detecting a VBus insertion
+                    (see Documentation/devicetree/bindings/gpio/gpio.txt)
+- vbus-regulator : should specifiy the regulator supplying current drawn from
+  the VBus line (see Documentation/devicetree/bindings/regulator/regulator.txt).
 Example:
        hsusb1_phy {
@@ -26,8 +31,11 @@ Example:
                clock-names = "main_clk";
                vcc-supply = <&hsusb1_vcc_regulator>;
                reset-gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                vbus-detect-gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+                vbus-regulator = <&vbus_regulator>;
        };
 hsusb1_phy is a NOP USB PHY device that gets its clock from an oscillator
 and expects that clock to be configured to 19.2MHz by the NOP PHY driver.
 hsusb1_vcc_regulator provides power to the PHY and GPIO 7 controls RESET.
+GPIO 13 detects VBus insertion, and accordingly notifies the vbus-regulator.
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index d443279c95dc..389ca1347a77 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -4,12 +4,15 @@ This isn't an exhaustive list, but you should add new prefixes to it before
 using them to avoid name-space collisions.
 abilis  Abilis Systems
+abcn    Abracon Corporation
 active-semi     Active-Semi International Inc
 ad      Avionic Design GmbH
 adapteva        Adapteva, Inc.
+adh     AD Holdings Plc.
 adi     Analog Devices, Inc.
 aeroflexgaisler Aeroflex Gaisler AB
 allwinner       Allwinner Technology Co., Ltd.
+alphascale      AlphaScale Integrated Circuits Systems, Inc.
 altr    Altera Corp.
 amcc    Applied Micro Circuits Corporation (APM, formally AMCC)
 amd     Advanced Micro Devices (AMD), Inc.
@@ -23,6 +26,7 @@ asahi-kasei	Asahi Kasei Corp.
 atmel   Atmel Corporation
 auo     AU Optronics Corporation
 avago   Avago Technologies
+avic    Shanghai AVIC Optoelectronics Co., Ltd.
 bosch   Bosch Sensortec GmbH
 brcm    Broadcom Corporation
 buffalo Buffalo, Inc.
@@ -31,11 +35,15 @@ capella	Capella Microsystems, Inc
 cavium  Cavium, Inc.
 cdns    Cadence Design Systems Inc.
 chipidea        Chipidea, Inc
+chipspark       ChipSPARK
 chrp    Common Hardware Reference Platform
 chunghwa        Chunghwa Picture Tubes Ltd.
 cirrus  Cirrus Logic, Inc.
+cloudengines    Cloud Engines, Inc.
 cnm     Chips&Media, Inc.
+cnxt    Conexant Systems, Inc.
 cortina Cortina Systems, Inc.
+cosmic  Cosmic Circuits
 crystalfontz    Crystalfontz America, Inc.
 dallas  Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom DAVICOM Semiconductor, Inc.
@@ -54,14 +62,18 @@ epcos	EPCOS AG
 epfl    Ecole Polytechnique Fédérale de Lausanne
 epson   Seiko Epson Corp.
 est     ESTeem Wireless Modems
+ettus   NI Ettus Research
 eukrea  Eukréa Electromatique
 everest Everest Semiconductor Co. Ltd.
+everspin        Everspin Technologies, Inc.
 excito  Excito
 fcs     Fairchild Semiconductor
+firefly Firefly
 fsl     Freescale Semiconductor
 GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef     GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 geniatech       Geniatech, Inc.
+giantplus       Giantplus Technology Co., Ltd.
 globalscale     Globalscale Technologies, Inc.
 gmt     Global Mixed-mode Technology, Inc.
 google  Google, Inc.
@@ -69,6 +81,7 @@ gumstix	Gumstix, Inc.
 gw      Gateworks Corporation
 hannstar        HannStar Display Corporation
 haoyu   Haoyu Microelectronic Co. Ltd.
+himax   Himax Technologies, Inc.
 hisilicon       Hisilicon Limited.
 hit     Hitachi Ltd.
 honeywell       Honeywell
@@ -82,8 +95,7 @@ innolux	Innolux Corporation
 intel   Intel Corporation
 intercontrol    Inter Control Group
 isee    ISEE 2007 S.L.
-isil    Intersil (deprecated, use isl)
+isil    Intersil
-isl     Intersil
 karo    Ka-Ro electronics GmbH
 keymile Keymile GmbH
 lacie   LaCie
@@ -118,7 +130,9 @@ nvidia	NVIDIA
 nxp     NXP Semiconductors
 onnn    ON Semiconductor Corp.
 opencores       OpenCores.org
+ovti    OmniVision Technologies
 panasonic       Panasonic Corporation
+parade  Parade Technologies Inc.
 pericom Pericom Technology Inc.
 phytec  PHYTEC Messtechnik GmbH
 picochip        Picochip Ltd
@@ -142,8 +156,10 @@ sandisk	Sandisk Corporation
 sbs     Smart Battery System
 schindler       Schindler
 seagate Seagate Technology PLC
+semtech Semtech Corporation
 sil     Silicon Image
 silabs  Silicon Laboratories
+siliconmitus    Silicon Mitus, Inc.
 simtek
 sii     Seiko Instruments, Inc.
 silergy Silergy Corp.
@@ -154,6 +170,7 @@ snps	Synopsys, Inc.
 solidrun        SolidRun
 sony    Sony Corporation
 spansion        Spansion Inc.
+sprd    Spreadtrum Communications Inc.
 st      STMicroelectronics
 ste     ST-Ericsson
 stericsson      ST-Ericsson
@@ -165,6 +182,7 @@ tlm	Trusted Logic Mobility
 toradex Toradex AG
 toshiba Toshiba Corporation
 toumaz  Toumaz
+truly   Truly Semiconductors Limited
 usi     Universal Scientific Industrial Co., Ltd.
 v3      V3 Semiconductor
 variscite       Variscite Ltd.
diff --git a/Documentation/devicetree/bindings/video/bridge/ps8622.txt b/Documentation/devicetree/bindings/video/bridge/ps8622.txt
new file mode 100644
index 000000000000..c989c3807f2b
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/bridge/ps8622.txt
@@ -0,0 +1,31 @@
+ps8622-bridge bindings
+Required properties:
+        - compatible: "parade,ps8622" or "parade,ps8625"
+        - reg: first i2c address of the bridge
+        - sleep-gpios: OF device-tree gpio specification for PD_ pin.
+        - reset-gpios: OF device-tree gpio specification for RST_ pin.
+Optional properties:
+        - lane-count: number of DP lanes to use
+        - use-external-pwm: backlight will be controlled by an external PWM
+        - video interfaces: Device node can contain video interface port
+                            nodes for panel according to [1].
+[1]: Documentation/devicetree/bindings/media/video-interfaces.txt
+Example:
+        lvds-bridge@48 {
+                compatible = "parade,ps8622";
+                reg = <0x48>;
+                sleep-gpios = <&gpc3 6 1 0 0>;
+                reset-gpios = <&gpc3 1 1 0 0>;
+                lane-count = <1>;
+                ports {
+                        port@0 {
+                                bridge_out: endpoint {
+                                        remote-endpoint = <&panel_in>;
+                                };
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/drm/bridge/ptn3460.txt b/Documentation/devicetree/bindings/video/bridge/ptn3460.txt
index 52b93b2c6748..361971ba104d 100644
--- a/Documentation/devicetree/bindings/drm/bridge/ptn3460.txt
+++ b/Documentation/devicetree/bindings/video/bridge/ptn3460.txt
@@ -3,8 +3,8 @@ ptn3460 bridge bindings
 Required properties:
        - compatible: "nxp,ptn3460"
        - reg: i2c address of the bridge
-        - powerdown-gpio: OF device-tree gpio specification
+        - powerdown-gpio: OF device-tree gpio specification  for PD_N pin.
-        - reset-gpio: OF device-tree gpio specification
+        - reset-gpio: OF device-tree gpio specification for RST_N pin.
        - edid-emulation: The EDID emulation entry to use
                +-------+------------+------------------+
                | Value | Resolution | Description      |
@@ -17,6 +17,11 @@ Required properties:
                |   6   |  1600x900  | ChiMei M215HGE   |
                +-------+------------+------------------+
+        - video interfaces: Device node can contain video interface port
+                            nodes for panel according to [1].
+[1]: Documentation/devicetree/bindings/media/video-interfaces.txt
 Example:
        lvds-bridge@20 {
                compatible = "nxp,ptn3460";
@@ -24,4 +29,11 @@ Example:
                powerdown-gpio = <&gpy2 5 1 0 0>;
                reset-gpio = <&gpx1 5 1 0 0>;
                edid-emulation = <5>;
+                ports {
+                        port@0 {
+                                bridge_out: endpoint {
+                                        remote-endpoint = <&panel_in>;
+                                };
+                        };
+                };
        };
diff --git a/Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt b/Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt
new file mode 100644
index 000000000000..668091f27674
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt
@@ -0,0 +1,46 @@
+Rockchip specific extensions to the Synopsys Designware HDMI
+================================
+Required properties:
+- compatible: "rockchip,rk3288-dw-hdmi";
+- reg: Physical base address and length of the controller's registers.
+- clocks: phandle to hdmi iahb and isfr clocks.
+- clock-names: should be "iahb" "isfr"
+- rockchip,grf: this soc should set GRF regs to mux vopl/vopb.
+- interrupts: HDMI interrupt number
+- ports: contain a port node with endpoint definitions as defined in
+  Documentation/devicetree/bindings/media/video-interfaces.txt. For
+  vopb,set the reg = <0> and set the reg = <1> for vopl.
+- reg-io-width: the width of the reg:1,4, the value should be 4 on
+  rk3288 platform
+Optional properties
+- ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
+- clocks, clock-names: phandle to the HDMI CEC clock, name should be "cec"
+Example:
+hdmi: hdmi@ff980000 {
+        compatible = "rockchip,rk3288-dw-hdmi";
+        reg = <0xff980000 0x20000>;
+        reg-io-width = <4>;
+        ddc-i2c-bus = <&i2c5>;
+        rockchip,grf = <&grf>;
+        interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
+        clock-names = "iahb", "isfr";
+        status = "disabled";
+        ports {
+                hdmi_in: port {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        hdmi_in_vopb: endpoint@0 {
+                                reg = <0>;
+                                remote-endpoint = <&vopb_out_hdmi>;
+                        };
+                        hdmi_in_vopl: endpoint@1 {
+                                reg = <1>;
+                                remote-endpoint = <&vopl_out_hdmi>;
+                        };
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/video/exynos7-decon.txt b/Documentation/devicetree/bindings/video/exynos7-decon.txt
new file mode 100644
index 000000000000..f5f9c8d4a55a
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/exynos7-decon.txt
@@ -0,0 +1,68 @@
+Device-Tree bindings for Samsung Exynos7 SoC display controller (DECON)
+DECON (Display and Enhancement Controller) is the Display Controller for the
+Exynos7 series of SoCs which transfers the image data from a video memory
+buffer to an external LCD interface.
+Required properties:
+- compatible: value should be "samsung,exynos7-decon";
+- reg: physical base address and length of the DECON registers set.
+- interrupt-parent: should be the phandle of the decon controller's
+                parent interrupt controller.
+- interrupts: should contain a list of all DECON IP block interrupts in the
+                 order: FIFO Level, VSYNC, LCD_SYSTEM. The interrupt specifier
+                 format depends on the interrupt controller used.
+- interrupt-names: should contain the interrupt names: "fifo", "vsync",
+        "lcd_sys", in the same order as they were listed in the interrupts
+        property.
+- pinctrl-0: pin control group to be used for this controller.
+- pinctrl-names: must contain a "default" entry.
+- clocks: must include clock specifiers corresponding to entries in the
+         clock-names property.
+- clock-names: list of clock names sorted in the same order as the clocks
+               property. Must contain "pclk_decon0", "aclk_decon0",
+               "decon0_eclk", "decon0_vclk".
+- i80-if-timings: timing configuration for lcd i80 interface support.
+Optional Properties:
+- samsung,power-domain: a phandle to DECON power domain node.
+- display-timings: timing settings for DECON, as described in document [1].
+                Can be used in case timings cannot be provided otherwise
+                or to override timings provided by the panel.
+[1]: Documentation/devicetree/bindings/video/display-timing.txt
+Example:
+SoC specific DT entry:
+        decon@13930000 {
+                compatible = "samsung,exynos7-decon";
+                interrupt-parent = <&combiner>;
+                reg = <0x13930000 0x1000>;
+                interrupt-names = "lcd_sys", "vsync", "fifo";
+                interrupts = <0 188 0>, <0 189 0>, <0 190 0>;
+                clocks = <&clock_disp PCLK_DECON_INT>,
+                         <&clock_disp ACLK_DECON_INT>,
+                         <&clock_disp SCLK_DECON_INT_ECLK>,
+                         <&clock_disp SCLK_DECON_INT_EXTCLKPLL>;
+                clock-names = "pclk_decon0", "aclk_decon0", "decon0_eclk",
+                                "decon0_vclk";
+                status = "disabled";
+        };
+Board specific DT entry:
+        decon@13930000 {
+                pinctrl-0 = <&lcd_clk &pwm1_out>;
+                pinctrl-names = "default";
+                status = "okay";
+        };
diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt b/Documentation/devicetree/bindings/video/exynos_dp.txt
index 53dbccfa80ca..7a3a9cdb86ab 100644
--- a/Documentation/devicetree/bindings/video/exynos_dp.txt
+++ b/Documentation/devicetree/bindings/video/exynos_dp.txt
@@ -66,6 +66,10 @@ Optional properties for dp-controller:
                Hotplug detect GPIO.
                        Indicates which GPIO should be used for hotplug
                        detection
+        -video interfaces: Device node can contain video interface port
+                            nodes according to [1].
+[1]: Documentation/devicetree/bindings/media/video-interfaces.txt
 Example:
@@ -105,4 +109,12 @@ Board Specific portion:
                                vsync-len = <6>;
                        };
                };
+                ports {
+                        port@0 {
+                                dp_out: endpoint {
+                                        remote-endpoint = <&bridge_in>;
+                                };
+                        };
+                };
        };
diff --git a/Documentation/devicetree/bindings/video/exynos_dsim.txt b/Documentation/devicetree/bindings/video/exynos_dsim.txt
index ca2b4aacd9af..802aa7ef64e5 100644
--- a/Documentation/devicetree/bindings/video/exynos_dsim.txt
+++ b/Documentation/devicetree/bindings/video/exynos_dsim.txt
@@ -21,7 +21,7 @@ Required properties:
    according to DSI host bindings (see MIPI DSI bindings [1])
 Optional properties:
-  - samsung,power-domain: a phandle to DSIM power domain node
+  - power-domains: a phandle to DSIM power domain node
 Child nodes:
  Should contain DSI peripheral nodes (see MIPI DSI bindings [1]).
@@ -53,7 +53,7 @@ Example:
                phy-names = "dsim";
                vddcore-supply = <&vusb_reg>;
                vddio-supply = <&vmipi_reg>;
-                samsung,power-domain = <&pd_lcd0>;
+                power-domains = <&pd_lcd0>;
                #address-cells = <1>;
                #size-cells = <0>;
                samsung,pll-clock-frequency = <24000000>;
diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt b/Documentation/devicetree/bindings/video/exynos_mixer.txt
index 08b394b1edbf..3e38128f866b 100644
--- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
+++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
@@ -15,6 +15,7 @@ Required properties:
        a) mixer: Gate of Mixer IP bus clock.
        b) sclk_hdmi: HDMI Special clock, one of the two possible inputs of
               mixer mux.
+        c) hdmi: Gate of HDMI IP bus clock, needed together with sclk_hdmi.
 Example:
diff --git a/Documentation/devicetree/bindings/video/renesas,du.txt b/Documentation/devicetree/bindings/video/renesas,du.txt
index 5102830f2760..c902323928f7 100644
--- a/Documentation/devicetree/bindings/video/renesas,du.txt
+++ b/Documentation/devicetree/bindings/video/renesas,du.txt
@@ -26,6 +26,10 @@ Required Properties:
      per LVDS encoder. The functional clocks must be named "du.x" with "x"
      being the channel numerical index. The LVDS clocks must be named
      "lvds.x" with "x" being the LVDS encoder numerical index.
+    - In addition to the functional and encoder clocks, all DU versions also
+      support externally supplied pixel clocks. Those clocks are optional.
+      When supplied they must be named "dclkin.x" with "x" being the input
+      clock numerical index.
 Required nodes:
diff --git a/Documentation/devicetree/bindings/video/samsung-fimd.txt b/Documentation/devicetree/bindings/video/samsung-fimd.txt
index cf1af6371021..a8bbbde03e79 100644
--- a/Documentation/devicetree/bindings/video/samsung-fimd.txt
+++ b/Documentation/devicetree/bindings/video/samsung-fimd.txt
@@ -38,7 +38,7 @@ Required properties:
               property. Must contain "sclk_fimd" and "fimd".
 Optional Properties:
- samsung,power-domain: a phandle to FIMD power domain node.
+- power-domains: a phandle to FIMD power domain node.
 - samsung,invert-vden: video enable signal is inverted
 - samsung,invert-vclk: video clock signal is inverted
 - display-timings: timing settings for FIMD, as described in document [1].
@@ -97,7 +97,7 @@ SoC specific DT entry:
                interrupts = <11 0>, <11 1>, <11 2>;
                clocks = <&clock 140>, <&clock 283>;
                clock-names = "sclk_fimd", "fimd";
-                samsung,power-domain = <&pd_lcd0>;
+                power-domains = <&pd_lcd0>;
                status = "disabled";
        };
diff --git a/Documentation/devicetree/bindings/video/ti,dra7-dss.txt b/Documentation/devicetree/bindings/video/ti,dra7-dss.txt
new file mode 100644
index 000000000000..f33a05137b0e
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/ti,dra7-dss.txt
@@ -0,0 +1,69 @@
+Texas Instruments DRA7x Display Subsystem
+=========================================
+See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic
+description about OMAP Display Subsystem bindings.
+DSS Core
+--------
+Required properties:
+- compatible: "ti,dra7-dss"
+- reg: address and length of the register spaces for 'dss'
+- ti,hwmods: "dss_core"
+- clocks: handle to fclk
+- clock-names: "fck"
+- syscon: phandle to control module core syscon node
+Optional properties:
+Some DRA7xx SoCs have one dedicated video PLL, some have two. These properties
+can be used to describe the video PLLs:
+- reg: address and length of the register spaces for 'pll1_clkctrl',
+  'pll1', 'pll2_clkctrl', 'pll2'
+- clocks: handle to video1 pll clock and video2 pll clock
+- clock-names: "video1_clk" and "video2_clk"
+Required nodes:
+- DISPC
+Optional nodes:
+- DSS Submodules: HDMI
+- Video port for DPI output
+DPI Endpoint required properties:
+- data-lines: number of lines used
+DISPC
+-----
+Required properties:
+- compatible: "ti,dra7-dispc"
+- reg: address and length of the register space
+- ti,hwmods: "dss_dispc"
+- interrupts: the DISPC interrupt
+- clocks: handle to fclk
+- clock-names: "fck"
+HDMI
+----
+Required properties:
+- compatible: "ti,dra7-hdmi"
+- reg: addresses and lengths of the register spaces for 'wp', 'pll', 'phy',
+       'core'
+- reg-names: "wp", "pll", "phy", "core"
+- interrupts: the HDMI interrupt line
+- ti,hwmods: "dss_hdmi"
+- vdda-supply: vdda power supply
+- clocks: handles to fclk and pll clock
+- clock-names: "fck", "sys_clk"
+Optional nodes:
+- Video port for HDMI output
+HDMI Endpoint optional properties:
+- lanes: list of 8 pin numbers for the HDMI lanes: CLK+, CLK-, D0+, D0-,
+  D1+, D1-, D2+, D2-. (default: 0,1,2,3,4,5,6,7)
diff --git a/Documentation/devicetree/bindings/video/ti,opa362.txt b/Documentation/devicetree/bindings/video/ti,opa362.txt
new file mode 100644
index 000000000000..f96083c0bd17
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/ti,opa362.txt
@@ -0,0 +1,38 @@
+OPA362 analog video amplifier
+Required properties:
+- compatible: "ti,opa362"
+- enable-gpios: enable/disable output gpio
+Required node:
+- Video port 0 for opa362 input
+- Video port 1 for opa362 output
+Example:
+tv_amp: opa362 {
+        compatible = "ti,opa362";
+        enable-gpios = <&gpio1 23 0>;  /* GPIO to enable video out amplifier */
+        ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                port@0 {
+                        reg = <0>;
+                        opa_in: endpoint@0 {
+                                remote-endpoint = <&venc_out>;
+                        };
+                };
+                port@1 {
+                        reg = <1>;
+                        opa_out: endpoint@0 {
+                                remote-endpoint = <&tv_connector_in>;
+                        };
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt b/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt
index 37afec194949..198794963786 100644
--- a/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt
@@ -13,6 +13,11 @@ Required Properties:
    by the GPIO flags.
 - hw_margin_ms: Maximum time to reset watchdog circuit (milliseconds).
+Optional Properties:
+- always-running: If the watchdog timer cannot be disabled, add this flag to
+  have the driver keep toggling the signal without a client. It will only cease
+  to toggle the signal when the device is open and the timeout elapsed.
 Example:
        watchdog: watchdog {
                /* ADM706 */
diff --git a/Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt b/Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt
new file mode 100644
index 000000000000..b2fa11fd43de
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt
@@ -0,0 +1,19 @@
+*ImgTec PowerDown Controller (PDC) Watchdog Timer (WDT)
+Required properties:
+- compatible : Should be "img,pdc-wdt"
+- reg : Should contain WDT registers location and length
+- clocks: Must contain an entry for each entry in clock-names.
+- clock-names: Should contain "wdt" and "sys"; the watchdog counter
+               clock and register interface clock respectively.
+- interrupts : Should contain WDT interrupt
+Examples:
+watchdog@18102100 {
+        compatible = "img,pdc-wdt";
+        reg = <0x18102100 0x100>;
+        clocks = <&pdc_wdt_clk>, <&sys_clk>;
+        clock-names = "wdt", "sys";
+        interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>;
+};
diff --git a/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt b/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt
new file mode 100644
index 000000000000..e27763ef0049
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt
@@ -0,0 +1,12 @@
+Ingenic Watchdog Timer (WDT) Controller for JZ4740
+Required properties:
+compatible: "ingenic,jz4740-watchdog"
+reg: Register address and length for watchdog registers
+Example:
+watchdog: jz4740-watchdog@0x10002000 {
+        compatible = "ingenic,jz4740-watchdog";
+        reg = <0x10002000 0x100>;
+};
diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
new file mode 100644
index 000000000000..af9eb5b8a253
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
@@ -0,0 +1,13 @@
+Mediatek SoCs Watchdog timer
+Required properties:
+- compatible : should be "mediatek,mt6589-wdt"
+- reg : Specifies base physical address and size of the registers.
+Example:
+wdt: watchdog@010000000 {
+        compatible = "mediatek,mt6589-wdt";
+        reg = <0x10000000 0x18>;
+};
diff --git a/Documentation/devicetree/overlay-notes.txt b/Documentation/devicetree/overlay-notes.txt
index 30ae758e3eef..d418a6ce9812 100644
--- a/Documentation/devicetree/overlay-notes.txt
+++ b/Documentation/devicetree/overlay-notes.txt
@@ -10,7 +10,7 @@ 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
+have the modification affecting the state of 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
@@ -80,7 +80,7 @@ result in foo+bar.dts
        };
 ---- foo+bar.dts -------------------------------------------------------------
-As a result of the the overlay, a new device node (bar) has been created
+As a result of 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.