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

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

More changes for omap dts files mostly to add support for
dm816x devices and clocks. Also adds a qspi device for
dra72x-evm.

* tag 'omap-for-v3.20/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: dra72-evm: Add qspi device
  ARM: dts: Add minimal support for dm8168-evm
  ARM: dts: Add basic clocks for dm816x
  ARM: dts: Add basic dm816x device tree configuration

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

diff --cc arch/arm/boot/dts/Makefile
index 89bb76298d90d48c843c6248f79dbb86a49626ab,a6ace4d57ea51b713586df30a961260eba9f5d86..17ee818d6583298df2a5599023b17a3d0b5dd8ce
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -393,8 -348,8 +393,10 @@@ dtb-$(CONFIG_ARCH_OMAP3) += 
        omap3-sbc-t3730.dtb \
        omap3-thunder.dtb \
        omap3-zoom3.dtb
 -dtb-$(CONFIG_SOC_TI81XX) += dm8168-evm.dtb
 -dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
++dtb-$(CONFIG_SOC_TI81XX) += \
++      dm8168-evm.dtb
 +dtb-$(CONFIG_SOC_AM33XX) += \
 +      am335x-base0033.dtb \
        am335x-bone.dtb \
        am335x-boneblack.dtb \
        am335x-evm.dtb \