Merge tag 'tegra-for-4.8-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "ARM: tegra: Device tree changes for v4.8-rc1" from Thierry Reding:

Some cleanups to existing device tree sources and add Toradex Apalis TK1
support.

* tag 'tegra-for-4.8-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Initial support for Apalis TK1
  ARM: tegra: Remove commas from unit addresses on Tegra124
  ARM: tegra: Import latest Jetson TK1 spreadsheet
  ARM: tegra: Add spaces around = in properties
  ARM: tegra: Fix a couple of DTC warnings

diff --combined arch/arm/boot/dts/Makefile
index 3cc5f08,3a13d4f..b25cc6a
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -17,10 -17,8 +17,10 @@@ dtb-$(CONFIG_SOC_SAM_V4_V5) += 
        evk-pro3.dtb \
        tny_a9260.dtb \
        usb_a9260.dtb \
 +      at91sam9260ek.dtb \
        at91sam9261ek.dtb \
        at91sam9263ek.dtb \
 +      at91-sam9_l9260.dtb \
        tny_a9263.dtb \
        usb_a9263.dtb \
        at91-foxg20.dtb \
@@@ -87,7 -85,6 +87,7 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
        bcm47094-dlink-dir-885l.dtb \
        bcm94708.dtb \
        bcm94709.dtb \
 +      bcm953012er.dtb \
        bcm953012k.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += \
        bcm963138dvt.dtb
@@@ -98,11 -95,8 +98,11 @@@ dtb-$(CONFIG_ARCH_BCM_CYGNUS) += 
        bcm958305k.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += \
        bcm28155-ap.dtb \
 -      bcm21664-garnet.dtb
 +      bcm21664-garnet.dtb \
 +      bcm23550-sparrow.dtb
  dtb-$(CONFIG_ARCH_BCM_NSP) += \
 +      bcm958525xmc.dtb \
 +      bcm958625hr.dtb \
        bcm958625k.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
        berlin2-sony-nsz-gs7.dtb \
@@@ -110,8 -104,6 +110,8 @@@
        berlin2q-marvell-dmp.dtb
  dtb-$(CONFIG_ARCH_BRCMSTB) += \
        bcm7445-bcm97445svmb.dtb
 +dtb-$(CONFIG_ARCH_CLPS711X) += \
 +      ep7211-edb7211.dtb
  dtb-$(CONFIG_ARCH_DAVINCI) += \
        da850-enbw-cmc.dtb \
        da850-evm.dtb
@@@ -142,7 -134,6 +142,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
        exynos5250-snow-rev5.dtb \
        exynos5250-spring.dtb \
        exynos5260-xyref5260.dtb \
 +      exynos5410-odroidxu.dtb \
        exynos5410-smdk5410.dtb \
        exynos5420-arndale-octa.dtb \
        exynos5420-peach-pit.dtb \
@@@ -155,6 -146,8 +155,6 @@@
        exynos5800-peach-pi.dtb
  dtb-$(CONFIG_ARCH_HI3xxx) += \
        hi3620-hi4511.dtb
 -dtb-$(CONFIG_ARCH_HIX5HD2) += \
 -      hisi-x5hd2-dkb.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += \
        highbank.dtb \
        ecx-2000.dtb
@@@ -162,10 -155,6 +162,10 @@@ dtb-$(CONFIG_ARCH_HIP01) += 
        hip01-ca9x2.dtb
  dtb-$(CONFIG_ARCH_HIP04) += \
        hip04-d01.dtb
 +dtb-$(CONFIG_ARCH_HISI) += \
 +      hi3519-demb.dtb
 +dtb-$(CONFIG_ARCH_HIX5HD2) += \
 +      hisi-x5hd2-dkb.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += \
        integratorap.dtb \
        integratorcp.dtb
@@@ -367,7 -356,6 +367,7 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6q-gw54xx.dtb \
        imx6q-gw551x.dtb \
        imx6q-gw552x.dtb \
 +      imx6q-h100.dtb \
        imx6q-hummingboard.dtb \
        imx6q-icore-rqs.dtb \
        imx6q-marsboard.dtb \
@@@ -389,7 -377,6 +389,7 @@@
        imx6q-tx6q-1110.dtb \
        imx6q-tx6q-11x0-mb7.dtb \
        imx6q-udoo.dtb \
 +      imx6q-utilite-pro.dtb \
        imx6q-wandboard.dtb \
        imx6q-wandboard-revb1.dtb \
        imx6qp-nitrogen6_max.dtb \
@@@ -412,11 -399,9 +412,11 @@@ dtb-$(CONFIG_SOC_IMX6UL) += 
        imx6ul-tx6ul-mainboard.dtb
  dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
 +      imx7d-colibri-eval-v3.dtb \
        imx7d-nitrogen7.dtb \
        imx7d-sbc-imx7.dtb \
 -      imx7d-sdb.dtb
 +      imx7d-sdb.dtb \
 +      imx7s-colibri-eval-v3.dtb
  dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-qds.dtb \
        ls1021a-twr.dtb
@@@ -431,9 -416,7 +431,9 @@@ dtb-$(CONFIG_SOC_VF610) += 
  dtb-$(CONFIG_ARCH_MXS) += \
        imx23-evk.dtb \
        imx23-olinuxino.dtb \
 +      imx23-sansa.dtb \
        imx23-stmp378x_devb.dtb \
 +      imx23-xfi3.dtb \
        imx28-apf28.dtb \
        imx28-apf28dev.dtb \
        imx28-apx4devkit.dtb \
@@@ -589,8 -572,7 +589,8 @@@ dtb-$(CONFIG_ARCH_PRIMA2) += 
  dtb-$(CONFIG_ARCH_OXNAS) += \
        wd-mbwe.dtb
  dtb-$(CONFIG_ARCH_QCOM) += \
 -      qcom-apq8064-arrow-db600c.dtb \
 +      qcom-apq8060-dragonboard.dtb \
 +      qcom-apq8064-arrow-sd-600eval.dtb \
        qcom-apq8064-cm-qs600.dtb \
        qcom-apq8064-ifc6410.dtb \
        qcom-apq8064-sony-xperia-yuga.dtb \
@@@ -620,7 -602,6 +620,7 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
        rk3066a-rayeager.dtb \
        rk3188-radxarock.dtb \
        rk3228-evb.dtb \
 +      rk3229-evb.dtb \
        rk3288-evb-act8846.dtb \
        rk3288-evb-rk808.dtb \
        rk3288-firefly-beta.dtb \
@@@ -657,7 -638,6 +657,7 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += 
        r8a7790-lager.dtb \
        r8a7791-koelsch.dtb \
        r8a7791-porter.dtb \
 +      r8a7792-blanche.dtb \
        r8a7793-gose.dtb \
        r8a7794-alt.dtb \
        r8a7794-silk.dtb \
@@@ -748,7 -728,6 +748,7 @@@ dtb-$(CONFIG_MACH_SUN6I) += 
        sun6i-a31s-yones-toptech-bs1078-v2.dtb
  dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-bananapi.dtb \
 +      sun7i-a20-bananapi-m1-plus.dtb \
        sun7i-a20-bananapro.dtb \
        sun7i-a20-cubieboard2.dtb \
        sun7i-a20-cubietruck.dtb \
@@@ -786,9 -765,7 +786,9 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-h3-orangepi-2.dtb \
        sun8i-h3-orangepi-one.dtb \
        sun8i-h3-orangepi-pc.dtb \
 -      sun8i-h3-orangepi-plus.dtb
 +      sun8i-h3-orangepi-plus.dtb \
 +      sun8i-h3-sinovoip-bpi-m2-plus.dtb \
 +      sun8i-r16-parrot.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb \
        sun9i-a80-cubieboard4.dtb
@@@ -816,6 -793,7 +816,7 @@@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += 
        tegra114-roth.dtb \
        tegra114-tn7.dtb
  dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \
+       tegra124-apalis-eval.dtb \
        tegra124-jetson-tk1.dtb \
        tegra124-nyan-big.dtb \
        tegra124-nyan-blaze.dtb \