Merge tag 'omap-for-v3.20/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "omap device tree changes for v3.20" from Tony Lindgren:

Device tree changes for omaps. Mostly to add support for new
am437x-idk and update am437x-sk boards. Also enabling new
devices for multiple boards.

* tag 'omap-for-v3.20/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits)
  ARM: dts: omap3-gta04: Add handling for tv output
  ARM: dts: cm-t3x: add NAND support
  ARM: dts: am57xx-beagle-x15: Add GPIO controlled fan node
  ARM: dts: am437x-idk: add gpio-based power key
  ARM: dts: N950/N9: add twl_power
  ARM: dts: am437x-sk: add power button binding
  ARM: dts: add support for AM437x IDK
  ARM: dts: am437x-gp-evm: add VPFE device tree data
  ARM: dts: am437x-sk-evm: add VPFE device tree data
  ARM: dts: am43x-epos-evm: add VPFE device tree data
  ARM: dts: am4372: add VPFE DT node entries
  ARM: dts: DRA7X: drop id property in pcie_phy
  ARM: dts: omap3-n900: cleanup english
  ARM: dts: am57xx-beagle-x15: Add dual ethernet
  ARM: dts: am437x-sk: remove DSS pulls
  ARM: dts: am437x-sk: remove internal i2c pullups
  ARM: dts: am437x-sk: add explicit pinmux for both USB instances
  ARM: dts: am437x-sk: remove ethernet pulls
  ARM: dts: am437x-sk: add explicit MMC0 pinmux
  ARM: dts: am437x-sk: remove internal pulls from QSPI
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/Makefile
index 8da1856,1b2c7de..89bb762
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -411,20 -364,17 +411,21 @@@ dtb-$(CONFIG_ARCH_OMAP4) += 
        omap4-sdp-es23plus.dtb \
        omap4-var-dvk-om44.dtb \
        omap4-var-stk-om44.dtb
 -dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
 +dtb-$(CONFIG_SOC_AM43XX) += \
 +      am43x-epos-evm.dtb \
        am437x-sk-evm.dtb \
+       am437x-idk-evm.dtb \
        am437x-gp-evm.dtb
 -dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
 +dtb-$(CONFIG_SOC_OMAP5) += \
 +      omap5-cm-t54.dtb \
        omap5-sbc-t54.dtb \
        omap5-uevm.dtb
 -dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
 +dtb-$(CONFIG_SOC_DRA7XX) += \
 +      dra7-evm.dtb \
        am57xx-beagle-x15.dtb \
        dra72-evm.dtb
 -dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.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