From: Olof Johansson <olof@lixom.net>
Date: Sat, 31 May 2014 03:32:48 +0000 (-0700)
Subject: Merge tag 'qcom-dt-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak... 
X-Git-Tag: v3.16-rc1~30^2~41^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bb195016513513c78954678c22d30a4b2d4a6b1f;p=users%2Fwilly%2Fxarray.git

Merge tag 'qcom-dt-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt

Merge "Qualcomm ARM Based Device Tree Updates for v3.16-2" from Kumar Gala:

* Updated MSM8660/MSM8960/MSM8974 dts for various updates or conformitity
  to binding specs
* Added APQ8064 SoC and IFC6410 board device tree support
* Added APQ8084 SoC and APQ8084-MTP board device tree support

* tag 'qcom-dt-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: dts: qcom: Add APQ8084-MTP board support
  ARM: dts: qcom: Add APQ8084 SoC support
  ARM: dts: qcom: Add initial APQ8064 SoC and IFC6410 board device trees
  ARM: dts: qcom: Update msm8660 device trees
  ARM: dts: qcom: Update msm8960 device trees
  ARM: dts: qcom: Update msm8974/apq8074 device trees

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

bb195016513513c78954678c22d30a4b2d4a6b1f
diff --cc arch/arm/boot/dts/Makefile
index b350409d5829,05d6859347ab..33409a3895b5
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -292,25 -273,37 +292,28 @@@ 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
 -dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.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-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 \
- 	qcom-apq8074-dragonboard.dtb
+ dtb-$(CONFIG_ARCH_QCOM) += \
+ 	qcom-apq8064-ifc6410.dtb \
+ 	qcom-apq8074-dragonboard.dtb \
+ 	qcom-apq8084-mtp.dtb \
+ 	qcom-msm8660-surf.dtb \
+ 	qcom-msm8960-cdp.dtb
 -dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 -	ste-hrefprev60-stuib.dtb \
 -	ste-hrefprev60-tvk.dtb \
 -	ste-hrefv60plus-stuib.dtb \
 -	ste-hrefv60plus-tvk.dtb \
 -	ste-ccu8540.dtb \
 -	ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
  	s3c6410-smdk6410.dtb