---

yaml --- r: 370599 b: refs/heads/master c: 59638c1 h: refs/heads/master i: 370597: 5378866 370595: 8495592 370591: ac9655e v: v3
git-mirror · Apr 3, 2013 · 5c0815b · 5c0815b
1 parent da2a6e4
commit 5c0815b
Show file tree

Hide file tree

Showing 86 changed files with 1,961 additions and 5,599 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac5ac893b21715cb6355303654b81625782d9cbf
+refs/heads/master: 59638c13153f56ba0546436e07d374abe1bfb50d
diff --git a/trunk/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt b/trunk/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -1660,7 +1660,7 @@ config ARCH_NR_GPIO
 	int
 	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
 	default 512 if SOC_OMAP5
-	default 392 if ARCH_U8500
+	default 355 if ARCH_U8500
 	default 288 if ARCH_VT8500 || ARCH_SUNXI
 	default 264 if MACH_H4700
 	default 0

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