From: Olof Johansson <olof@lixom.net>
Date: Tue, 5 Jul 2016 04:15:39 +0000 (-0700)
Subject: Merge tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni... 
X-Git-Tag: v4.8-rc1~66^2~21
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/35902cf1dae06f36e5304b79a7a540169e809969?hp=-c

Merge tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

DT Changes for 4.8 #2:
 - New board: at91sam9260ek
 - Fixes for the sam9_l9260
 - Sama5d2 Xplained PMIC fix
 - Addition of the PMU node for the sama5d2

* tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: sama5d2_xplained: Update the pmic node
  ARM: dts: at91: sama5d2: add PMU node
  ARM: dts: at91: sam9_l9260: Modify information in LED nodes.
  ARM: dts: at91: sam9_l9260: Add pinctrl information to ethernet node.
  ARM: dts: at91: add at91sam9260ek board DT

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

35902cf1dae06f36e5304b79a7a540169e809969
diff --combined arch/arm/boot/dts/Makefile
index 141f2e7a2e97,fbd7de633788..6dfefa36e7de
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -17,6 -17,7 +17,7 @@@ 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 \
@@@ -96,11 -97,8 +97,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 \
@@@ -138,7 -136,6 +139,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 \