Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper:

 - mvebu
    - merge armada 375, 380, 385 boards (mvebu/dt-3xx)

 - kirkwood
    - Add many Synology NAS boards
    - add board HP T5325
    - add L2 cache node
    - add system-controller node
    - add audio node

 - dove
    - add pinctrl and global-config register

Depends:
 - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
    - removed dove PMU interrupt controller

Conflicts:
 - mvebu/soc (arch/arm/boot/dts/Makefile)
    - add/add conflict.
    - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)

* tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add dts file describing HP T5325 thin client
  ARM: kirkwood: Add i2c alias so setting bus number
  ARM: kirkwood: Add audio node to kirkwood.dtsi
  ARM: mvebu: select dtbs from MACH_ARMADA_*
  ARM: dove: add global-config register node
  ARM: dove: add additional pinctrl registers
  ARM: mvebu: Instantiate system controller in kirkwood.dtsi
  ARM: kirkwood: Instantiate L2 cache from DT.
  ARM: mvebu: use macros for interrupt flags on Armada 375/38x
  ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs
  ARM: mvebu: use C preprocessor include for Armada 375/38x DTs
  ARM: Kirkwood: Add support for many Synology NAS devices
  DT: i2c: Trivial: Add sii,s35390a
  DT: Vendor prefixes: Add ricoh, qnap, sii and synology
  ARM: dove: dt: revert PMU interrupt controller node
  ARM: mvebu: add Device Tree for the Armada 385 DB board
  ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs
  ARM: mvebu: add Device Tree for the Armada 375 DB board
  ARM: mvebu: add Device Tree description of the Armada 375 SoC
  ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260

Conflicts:
	Documentation/devicetree/bindings/vendor-prefixes.txt
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index e9d19e2b359bf9ec46563f4cd908193967507371,c73b435f58f57caeb15dc0ec15211ccf8339620d..4685ec396c34c86d2b1c7125da937aef95da7024
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -69,7 -64,8 +69,8 @@@ phytec        PHYTEC Messtechnik Gmb
  picochip      Picochip Ltd
  powervr       PowerVR (deprecated, use img)
  qca   Qualcomm Atheros, Inc.
 -qcom  Qualcomm, Inc.
 +qcom  Qualcomm Technologies, Inc
+ qnap  QNAP Systems, Inc.
  ralink        Mediatek/Ralink Technology Corp.
  ramtron       Ramtron International
  realtek Realtek Semiconductor Corp.
@@@ -81,9 -78,9 +83,10 @@@ schindler    Schindle
  sil   Silicon Image
  silabs        Silicon Laboratories
  simtek
+ sii   Seiko Instruments, Inc.
  sirf  SiRF Technology, Inc.
  snps  Synopsys, Inc.
 +spansion      Spansion Inc.
  st    STMicroelectronics
  ste   ST-Ericsson
  stericsson    ST-Ericsson

diff --cc arch/arm/boot/dts/Makefile
index 580f9ab2022ddfeb5396471ce5adf2df16a8a01d,a292b3cc94a51894cfc77eba062b8cbf716e6e80..489959dfe6d143451c53af6dd2dd62a29f66e187
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -125,19 -140,27 +141,8 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-ts419-6282.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
- dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 -dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 -      qcom-msm8960-cdp.dtb \
 -      qcom-apq8074-dragonboard.dtb
 -dtb-$(CONFIG_MACH_ARMADA_370) += \
 -      armada-370-db.dtb \
--      armada-370-mirabox.dtb \
--      armada-370-netgear-rn102.dtb \
--      armada-370-netgear-rn104.dtb \
-       armada-370-rd.dtb \
 -      armada-370-rd.dtb
 -dtb-$(CONFIG_MACH_ARMADA_375) += \
 -      armada-375-db.dtb
 -dtb-$(CONFIG_MACH_ARMADA_38X) += \
 -      armada-385-db.dtb
 -dtb-$(CONFIG_MACH_ARMADA_XP) += \
--      armada-xp-axpwifiap.dtb \
--      armada-xp-db.dtb \
--      armada-xp-gp.dtb \
--      armada-xp-netgear-rn2120.dtb \
--      armada-xp-matrix.dtb \
--      armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
 +      imx25-eukrea-mbimxsd25-baseboard.dtb \
        imx25-karo-tx25.dtb \
        imx25-pdk.dtb \
        imx27-apf27.dtb \
@@@ -361,6 -348,6 +366,23 @@@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv0
  dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
        zynq-zc706.dtb \
        zynq-zed.dtb
++dtb-$(CONFIG_MACH_ARMADA_370) += \
++      armada-370-db.dtb \
++      armada-370-mirabox.dtb \
++      armada-370-netgear-rn102.dtb \
++      armada-370-netgear-rn104.dtb \
++      armada-370-rd.dtb
++dtb-$(CONFIG_MACH_ARMADA_375) += \
++      armada-375-db.dtb
++dtb-$(CONFIG_MACH_ARMADA_38X) += \
++      armada-385-db.dtb
++dtb-$(CONFIG_MACH_ARMADA_XP) += \
++      armada-xp-axpwifiap.dtb \
++      armada-xp-db.dtb \
++      armada-xp-gp.dtb \
++      armada-xp-netgear-rn2120.dtb \
++      armada-xp-matrix.dtb \
++      armada-xp-openblocks-ax3-4.dtb
  
  targets += dtbs
  targets += $(dtb-y)