From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Mar 2016 22:26:57 +0000 (-0700)
Subject: Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.6-rc1~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=915c56bc01d6eab071e0dd1c6ea3bf73fbe5124f;p=thirdparty%2Flinux.git

Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM 64-bit DT updates from Arnd Bergmann:
 "The arm64 device tree changes make up an increasing portion of the
  overall changes, so they are kept separate from the 32-bit devicetree
  changes and from the other arm64 updates.

  Newly added SoCs and boards are:
   - 96Boards Husky board
   - AMD Overdrive board
   - Amlogic S905 SoC and related Tronsmart boxes
   - Annapurna Labs Alpine family and development board
   - Broadcom Vulcan servers
   - Broadcom Northstar 2 SoC
   - Marvell Armada 3700 family and development board
   - Qualcomm MSM8996 SoC

  Additional devices are enabled for existing platforms from Applied
  Micro, Hisilicon, Mediatek, Qualcomm, and Renesas and there are a
  couple of other updates for Rockchip, Xilinx and NXP/Freescale"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (102 commits)
  ARM64: dts: amlogic: Add Tronsmart Vega S95 configs
  Documentation: devicetree: amlogic: Document Tronsmart Vega S95 boards
  ARM64: dts: Prepare configs for Amlogic Meson GXBaby
  Documentation: devicetree: amlogic: Document Meson GXBaby
  devicetree: bindings: Add vendor prefix for Tronsmart
  arm64: dts: qcom: Fix MPP's function used for LED control
  arm64: dts: alpine: add the MSIX node in the Alpine v2 dtsi
  arm64: dts: add the Alpine v2 EVP
  arm64: dts: marvell: re-order Device Tree nodes for Armada AP806
  arm64: dts: marvell: update Armada AP806 clock description
  arm64: dts: marvell: add Device Tree files for Armada 7K/8K
  arm64: dts: apm: Add DT node for X-Gene v2 SLIMpro Mailbox I2C Driver
  arm64: dts: apm: Mailbox device tree node for APM X-Gene v2 platform.
  arm64: dts: apm: Add DT node for X-Gene v1 SLIMpro Mailbox I2C Driver
  arm64: dts: apm: mailbox device tree node for APM X-Gene platform.
  arm64: dts: apm: Update GPIO to control power-off on X-Gene v2 platforms
  arm64: dts: apm: Update GPIO standby controller DT node for X-Gene v2 platforms
  arm64: dts: apm: Update GPIO to control power-off on X-Gene v1 platforms
  arm64: dts: salvator-x: enable USB 2.0 Host of channel 1 and 2
  arm64: dts: salvator-x: enable usb2_phy of channel 1 and 2
  ...
---

915c56bc01d6eab071e0dd1c6ea3bf73fbe5124f
diff --cc Documentation/devicetree/bindings/ata/ahci-platform.txt
index 3d84dcae8475e,796e2c23e5df1..30df832a6f2f5
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@@ -11,9 -11,9 +11,10 @@@ Required properties
  - compatible        : compatible string, one of:
    - "allwinner,sun4i-a10-ahci"
    - "hisilicon,hisi-ahci"
 +  - "cavium,octeon-7130-ahci"
    - "ibm,476gtr-ahci"
    - "marvell,armada-380-ahci"
+   - "marvell,armada-3700-ahci"
    - "snps,dwc-ahci"
    - "snps,exynos5440-ahci"
    - "snps,spear-ahci"
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 787d4225c8ab2,ee8760481159a..42adb4101cc6b
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -246,9 -238,9 +246,10 @@@ toshiba	Toshiba Corporatio
  toumaz	Toumaz
  tplink	TP-LINK Technologies Co., Ltd.
  tronfy	Tronfy
+ tronsmart	Tronsmart
  truly	Truly Semiconductors Limited
  upisemi	uPI Semiconductor Corp.
 +urt	United Radiant Technology Corporation
  usi	Universal Scientific Industrial Co., Ltd.
  v3	V3 Semiconductor
  variscite	Variscite Ltd.