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
  ...

diff --cc Documentation/devicetree/bindings/arm/cpus.txt
Simple merge

diff --cc Documentation/devicetree/bindings/arm/marvell/marvell,kirkwood.txt
index 0000000,ab0c9cd..7d28fe4
mode 000000,100644..100644
--- /dev/null
--- 2/Documentation/devicetree/bindings/arm/marvell/marvell,kirkwood.txt
+++ b/Documentation/devicetree/bindings/arm/marvell/marvell,kirkwood.txt
@@@ -1,0 -1,102 +1,105 @@@
 -"buffalo,lswvl"
 -"buffalo,lswxl"
+ Marvell Kirkwood SoC Family Device Tree Bindings
+ ------------------------------------------------
+ 
+ Boards with a SoC of the Marvell Kirkwook family, eg 88f6281
+ 
+ * Required root node properties:
+ compatible: must contain "marvell,kirkwood"
+ 
+ In addition, the above compatible shall be extended with the specific
+ SoC. Currently known SoC compatibles are:
+ 
+ "marvell,kirkwood-88f6192"
+ "marvell,kirkwood-88f6281"
+ "marvell,kirkwood-88f6282"
+ "marvell,kirkwood-88f6283"
+ "marvell,kirkwood-88f6702"
+ "marvell,kirkwood-98DX4122"
+ 
+ And in addition, the compatible shall be extended with the specific
+ board. Currently known boards are:
+ 
++"buffalo,linkstation-lsqvl"
++"buffalo,linkstation-lsvl"
++"buffalo,linkstation-lswsxl"
++"buffalo,linkstation-lswxl"
++"buffalo,linkstation-lswvl"
+ "buffalo,lschlv2"
+ "buffalo,lsxhl"
+ "buffalo,lsxl"
+ "cloudengines,pogo02"
+ "cloudengines,pogoplugv4"
+ "dlink,dns-320"
+ "dlink,dns-320-a1"
+ "dlink,dns-325"
+ "dlink,dns-325-a1"
+ "dlink,dns-kirkwood"
+ "excito,b3"
+ "globalscale,dreamplug-003-ds2001"
+ "globalscale,guruplug"
+ "globalscale,guruplug-server-plus"
+ "globalscale,sheevaplug"
+ "globalscale,sheevaplug"
+ "globalscale,sheevaplug-esata"
+ "globalscale,sheevaplug-esata-rev13"
+ "iom,iconnect"
+ "iom,iconnect-1.1"
+ "iom,ix2-200"
+ "keymile,km_kirkwood"
+ "lacie,cloudbox"
+ "lacie,inetspace_v2"
+ "lacie,laplug"
+ "lacie,nas2big"
+ "lacie,netspace_lite_v2"
+ "lacie,netspace_max_v2"
+ "lacie,netspace_mini_v2"
+ "lacie,netspace_v2"
+ "marvell,db-88f6281-bp"
+ "marvell,db-88f6282-bp"
+ "marvell,mv88f6281gtw-ge"
+ "marvell,rd88f6281"
+ "marvell,rd88f6281"
+ "marvell,rd88f6281-a0"
+ "marvell,rd88f6281-a1"
+ "mpl,cec4"
+ "mpl,cec4-10"
+ "netgear,readynas"
+ "netgear,readynas"
+ "netgear,readynas-duo-v2"
+ "netgear,readynas-nv+-v2"
+ "plathome,openblocks-a6"
+ "plathome,openblocks-a7"
+ "raidsonic,ib-nas6210"
+ "raidsonic,ib-nas6210-b"
+ "raidsonic,ib-nas6220"
+ "raidsonic,ib-nas6220-b"
+ "raidsonic,ib-nas62x0"
+ "seagate,dockstar"
+ "seagate,goflexnet"
+ "synology,ds109"
+ "synology,ds110jv10"
+ "synology,ds110jv20"
+ "synology,ds110jv30"
+ "synology,ds111"
+ "synology,ds209"
+ "synology,ds210jv10"
+ "synology,ds210jv20"
+ "synology,ds212"
+ "synology,ds212jv10"
+ "synology,ds212jv20"
+ "synology,ds212pv10"
+ "synology,ds409"
+ "synology,ds409slim"
+ "synology,ds410j"
+ "synology,ds411"
+ "synology,ds411j"
+ "synology,ds411slim"
+ "synology,ds413jv10"
+ "synology,rs212"
+ "synology,rs409"
+ "synology,rs411"
+ "synology,rs812"
+ "usi,topkick"
+ "usi,topkick-1281P2"
+ "zyxel,nsa310"
+ "zyxel,nsa310a"

diff --cc Documentation/devicetree/bindings/ata/ahci-platform.txt
index 3d84dca,796e2c2..30df832
--- 1/Documentation/devicetree/bindings/ata/ahci-platform.txt
--- 2/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 787d422,ee87604..42adb41
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/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.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/apm/apm-storm.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
Simple merge