From: Olof Johansson <olof@lixom.net>
Date: Fri, 23 Jan 2015 21:48:57 +0000 (-0800)
Subject: Merge tag 'omap-for-v3.20/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=362c9a778c8597d96d469123b0bf738e8479bcb1;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'omap-for-v3.20/dt-pt2' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt

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

362c9a778c8597d96d469123b0bf738e8479bcb1
diff --cc arch/arm/boot/dts/Makefile
index 89bb76298d90,a6ace4d57ea5..17ee818d6583
--- a/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 \