Merge tag 'omap-for-v3.16/dt-part2-v2' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "ARM: omap dt changes for v3.16 merge window, part 2" From Tony Lindgren:

Device tree related changes for omaps.

* tag 'omap-for-v3.16/dt-part2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (49 commits)
  ARM: dts: Enable mcpdm and mcbsp1 on DuoVero
  ARM: dts: Convert DuoVero Parlor to use IOPAD macro
  ARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition
  ARM: dts: dra7: add support for parallel NAND flash
  ARM: dts: am437x-gp-evm: Add ethernet support for GP EVM
  ARM: dts: am4372: Add cpsw phy sel dt node
  ARM: OMAP2+: Use pdata quirks for wl12xx on VAR-STK/DVK-OM44
  ARM: dts: Add VAR-SOM-OM44 WLAN nodes
  ARM: dts: Add support for OMAP4 VAR-DVK-OM44
  ARM: dts: Add support for OMAP4 Variscite OM44 family
  ARM: dts: Change IOPAD macro's for OMAP4/5
  ARM: dts: AM33XX: fix ethernet and mdio default state
  ARM: dts: am4372: Add hdq device tree data
  ARM: omap2+: skip device build from platform code for dt
  dts: dra7-evm: add USB support
  ARM: dts: dra7: Add USB related nodes
  ARM: dts: dra7-clock: Add "l3init_960m_gfclk" clock gate
  ARM: dts: omap4+: Add clocks to USB2 PHY node
  ARM: dts: dra7: add OCP2SCP3 and SATA nodes
  ARM: dts: omap5: add sata node
  ...

Signed-off-by: Olof Johansson <[email protected]>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc arch/arm/boot/dts/Makefile
index 37e979f15f89303646591a2e572c36d177a32732,a81a24c7c1844f253559e20f749d39be32e9bea5..e063234b806d627e72c258ef1214cc4edcf4b380
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -282,26 -282,18 +291,21 @@@ dtb-$(CONFIG_ARCH_OMAP4) += omap4-duove
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
-       omap4-var-som.dtb \
        omap4-sdp.dtb \
        omap4-sdp-es23plus.dtb \
-       omap5-uevm.dtb \
-       am335x-evm.dtb \
-       am335x-evmsk.dtb \
-       am335x-bone.dtb \
-       am335x-boneblack.dtb \
-       am335x-nano.dtb \
-       am335x-base0033.dtb \
-       am3517-craneboard.dtb \
-       am3517-evm.dtb \
-       am3517_mt_ventoux.dtb \
-       am43x-epos-evm.dtb \
-       am437x-gp-evm.dtb \
-       dra7-evm.dtb
+       omap4-var-dvk-om44.dtb \
+       omap4-var-stk-om44.dtb
+ dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
+       am437x-gp-evm.dtb
+ dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
+       omap5-sbc-t54.dtb \
+       omap5-uevm.dtb
+ dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
+       dra72-evm.dtb
 -dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 +dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
 +      orion5x-lacie-ethernet-disk-mini-v2.dtb \
 +      orion5x-maxtor-shared-storage-2.dtb \
 +      orion5x-rd88f5182-nas.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \