---

yaml --- r: 370567 b: refs/heads/master c: 9159c84 h: refs/heads/master i: 370565: 4e23f44 370563: 627096f 370559: 52d3f08 v: v3
git-mirror · Mar 27, 2013 · 24d6dd8 · 24d6dd8
1 parent 092ae0d
commit 24d6dd8
Show file tree

Hide file tree

Showing 62 changed files with 763 additions and 4,029 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 926f638c3c2159e118f5935241bfc939ded0a790
+refs/heads/master: 9159c84f9e3dd1916034149d6876935d81716a4b
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -1660,7 +1660,7 @@ config LOCAL_TIMERS
 config ARCH_NR_GPIO
 	int
 	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
-	default 392 if ARCH_U8500
+	default 355 if ARCH_U8500
 	default 264 if MACH_H4700
 	default 512 if SOC_OMAP5
 	default 288 if ARCH_VT8500 || ARCH_SUNXI

diff --git a/trunk/arch/arm/boot/dts/Makefile b/trunk/arch/arm/boot/dts/Makefile
@@ -31,11 +31,6 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
 dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
 dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
 dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
-# sama5d3
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb
 
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb

diff --git a/trunk/arch/arm/boot/dts/atlas6-evb.dts b/trunk/arch/arm/boot/dts/atlas6-evb.dts