Merge tag 'qcom-dt-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/agross...

Merge "Qualcomm ARM Based Device Tree Updates for v4.6" from Andy Gross:

* Add documentation for Kryo
* Add RPMCC node for APQ8064
* Updates for MSM8974
* Add board clocks
* Add support for Nexus7 device
* Fixup pmic reg properties
* Various updates/cleanups for APQ8064 based boards

* tag 'qcom-dt-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (23 commits)
  ARM: dts: ifc6410: add correct aliases to the i2c and spi bus
  ARM: dts: apq8064: add i2c6 device node.
  ARM: dts: ifc6410: enable cam i2c device
  ARM: dts: apq8064: add gsbi4 with i2c node.
  ARM: dts: apq8064: add missing i2c2 pinctrl info
  ARM: dts: ifc6410: enable spi device on expansion
  ARM: dts: apq8064: add spi5 device node.
  ARM: dts: apq8064: add i2c sleep pinctrl states.
  ARM: dts: apq8064: add pci support in CM QS600
  ARM: dts: apq8064: move pinctrls to dedicated dtsi
  ARM: dts: qcom: fix i2c lables to be inline with others
  dts: msm8974: Add dma channels for blsp2_i2c1 node
  dts: msm8974: Add blsp2_bam dma node
  ARM: dts: qcom: Remove size elements from pmic reg properties
  devicetree: bindings: Document qcom board compatible format
  devicetree: Add DTS file to support the Nexus7 2013 (flo) device.
  devicetree: qcom-apq8064.dtsi: Add i2c3 address-cells and size-cells values
  arm: dts: qcom: Add more board clocks
  ARM: dts: qcom: msm8974: Add WCNSS SMP2P node
  ARM: dts: qcom: msm8974: Add smsm node
  ...

diff --combined arch/arm/boot/dts/Makefile
index be1d7c9,f6444be..bfc8770
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -2,8 -2,6 +2,8 @@@ ifeq ($(CONFIG_OF),y
  
  dtb-$(CONFIG_ARCH_ALPINE) += \
        alpine-db.dtb
 +dtb-$(CONFIG_MACH_ARTPEC6) += \
 +      artpec6-devboard.dtb
  dtb-$(CONFIG_MACH_ASM9260) += \
        alphascale-asm9260-devkit.dtb
  # Keep at91 dtb files sorted alphabetically for each SoC
@@@ -62,7 -60,6 +62,7 @@@ dtb-$(CONFIG_ARCH_AXXIA) += 
        axm5516-amarillo.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += \
        bcm2835-rpi-b.dtb \
 +      bcm2835-rpi-a.dtb \
        bcm2835-rpi-b-rev2.dtb \
        bcm2835-rpi-b-plus.dtb \
        bcm2835-rpi-a-plus.dtb \
@@@ -82,7 -79,6 +82,7 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
        bcm4709-buffalo-wxr-1900dhp.dtb \
        bcm4709-netgear-r7000.dtb \
        bcm4709-netgear-r8000.dtb \
 +      bcm47094-dlink-dir-885l.dtb \
        bcm94708.dtb \
        bcm94709.dtb \
        bcm953012k.dtb
@@@ -160,8 -156,7 +160,8 @@@ dtb-$(CONFIG_ARCH_INTEGRATOR) += 
  dtb-$(CONFIG_ARCH_KEYSTONE) += \
        k2hk-evm.dtb \
        k2l-evm.dtb \
 -      k2e-evm.dtb
 +      k2e-evm.dtb \
 +      keystone-k2g-evm.dtb
  dtb-$(CONFIG_MACH_KIRKWOOD) += \
        kirkwood-b3.dtb \
        kirkwood-blackarmor-nas220.dtb \
@@@ -194,12 -189,9 +194,12 @@@
        kirkwood-is2.dtb \
        kirkwood-km_kirkwood.dtb \
        kirkwood-laplug.dtb \
 +      kirkwood-linkstation-lsqvl.dtb \
 +      kirkwood-linkstation-lsvl.dtb \
 +      kirkwood-linkstation-lswsxl.dtb \
 +      kirkwood-linkstation-lswvl.dtb \
 +      kirkwood-linkstation-lswxl.dtb \
        kirkwood-lschlv2.dtb \
 -      kirkwood-lswvl.dtb \
 -      kirkwood-lswxl.dtb \
        kirkwood-lsxhl.dtb \
        kirkwood-mplcec4.dtb \
        kirkwood-mv88f6281gtw-ge.dtb \
@@@ -522,7 -514,6 +522,7 @@@ dtb-$(CONFIG_SOC_DRA7XX) += 
  dtb-$(CONFIG_ARCH_ORION5X) += \
        orion5x-lacie-d2-network.dtb \
        orion5x-lacie-ethernet-disk-mini-v2.dtb \
 +      orion5x-linkstation-lsgl.dtb \
        orion5x-linkstation-lswtgl.dtb \
        orion5x-lswsgl.dtb \
        orion5x-maxtor-shared-storage-2.dtb \
@@@ -533,6 -524,7 +533,7 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-apq8064-cm-qs600.dtb \
        qcom-apq8064-ifc6410.dtb \
        qcom-apq8064-sony-xperia-yuga.dtb \
+       qcom-apq8064-asus-nexus7-flo.dtb \
        qcom-apq8074-dragonboard.dtb \
        qcom-apq8084-ifc6540.dtb \
        qcom-apq8084-mtp.dtb \
@@@ -675,10 -667,8 +676,10 @@@ dtb-$(CONFIG_MACH_SUN7I) += 
        sun7i-a20-cubieboard2.dtb \
        sun7i-a20-cubietruck.dtb \
        sun7i-a20-hummingbird.dtb \
 +      sun7i-a20-itead-ibox.dtb \
        sun7i-a20-i12-tvbox.dtb \
        sun7i-a20-icnova-swac.dtb \
 +      sun7i-a20-lamobo-r1.dtb \
        sun7i-a20-m3.dtb \
        sun7i-a20-mk808c.dtb \
        sun7i-a20-olimex-som-evb.dtb \
@@@ -702,8 -692,6 +703,8 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-a33-ippo-q8h-v1.2.dtb \
        sun8i-a33-q8-tablet.dtb \
        sun8i-a33-sinlinx-sina33.dtb \
 +      sun8i-a83t-allwinner-h8homlet-v2.dtb \
 +      sun8i-a83t-cubietruck-plus.dtb \
        sun8i-h3-orangepi-plus.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb \
@@@ -822,7 -810,6 +823,7 @@@ dtb-$(CONFIG_ARCH_MEDIATEK) += 
        mt6580-evbp1.dtb \
        mt6589-aquaris5.dtb \
        mt6592-evb.dtb \
 +      mt7623-evb.dtb \
        mt8127-moose.dtb \
        mt8135-evbp1.dtb
  dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb