---

yaml --- r: 313430 b: refs/heads/master c: a44fccb h: refs/heads/master v: v3
git-mirror · Jul 17, 2012 · 3ae4265 · 3ae4265
1 parent 9234c4b
commit 3ae4265
Show file tree

Hide file tree

Showing 120 changed files with 1,612 additions and 4,819 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e3585113f8fe31b7015d52ac94f56c8952626f7
+refs/heads/master: a44fccbc18889676fa3f6b44319ca55b32646284
diff --git a/trunk/Documentation/devicetree/bindings/arm/omap/omap.txt b/trunk/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -47,6 +47,3 @@ Boards:
 
 - AM335X EVM : Software Developement Board for AM335x
   compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"
-
-- OMAP5 EVM : Evaluation Module
-  compatible = "ti,omap5-evm", "ti,omap5"
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -1595,7 +1595,6 @@ config ARCH_NR_GPIO
 	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
 	default 355 if ARCH_U8500
 	default 264 if MACH_H4700
-	default 512 if SOC_OMAP5
 	default 0
 	help
 	  Maximum number of GPIOs in the system.

diff --git a/trunk/arch/arm/boot/dts/omap5-evm.dts b/trunk/arch/arm/boot/dts/omap5-evm.dts
diff --git a/trunk/arch/arm/boot/dts/omap5.dtsi b/trunk/arch/arm/boot/dts/omap5.dtsi
diff --git a/trunk/arch/arm/configs/omap2plus_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig
@@ -236,4 +236,3 @@ CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
-CONFIG_SOC_OMAP5=y
diff --git a/trunk/arch/arm/mach-mvebu/Makefile.boot b/trunk/arch/arm/mach-mvebu/Makefile.boot
@@ -1 +1,3 @@
 zreladdr-y := 0x00008000
+dtb-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-db.dtb
+dtb-$(CONFIG_MACH_ARMADA_370_XP) += armada-xp-db.dtb
diff --git a/trunk/arch/arm/mach-omap1/board-ams-delta.c b/trunk/arch/arm/mach-omap1/board-ams-delta.c
@@ -37,12 +37,12 @@
 #include <plat/board-ams-delta.h>
 #include <plat/keypad.h>
 #include <plat/mux.h>
+#include <plat/usb.h>
 #include <plat/board.h>
 
 #include <mach/hardware.h>
 #include <mach/ams-delta-fiq.h>
 #include <mach/camera.h>
-#include <mach/usb.h>
 
 #include "iomap.h"
 #include "common.h"

diff --git a/trunk/arch/arm/mach-omap1/board-generic.c b/trunk/arch/arm/mach-omap1/board-generic.c
@@ -23,10 +23,8 @@
 #include <asm/mach/map.h>
 
 #include <plat/mux.h>
+#include <plat/usb.h>
 #include <plat/board.h>
-
-#include <mach/usb.h>
-
 #include "common.h"
 
 /* assume no Mini-AB port */

diff --git a/trunk/arch/arm/mach-omap1/board-h2.c b/trunk/arch/arm/mach-omap1/board-h2.c
@@ -40,11 +40,11 @@
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>
+#include <plat/usb.h>
 #include <plat/keypad.h>
 #include <plat/flash.h>
 
 #include <mach/hardware.h>
-#include <mach/usb.h>
 
 #include "common.h"
 #include "board-h2.h"

diff --git a/trunk/arch/arm/mach-omap1/board-h3.c b/trunk/arch/arm/mach-omap1/board-h3.c
@@ -40,13 +40,13 @@
 
 #include <plat/mux.h>
 #include <plat/tc.h>
+#include <plat/usb.h>
 #include <plat/keypad.h>
 #include <plat/dma.h>
 #include <plat/flash.h>
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
-#include <mach/usb.h>
 
 #include "common.h"
 #include "board-h3.h"

diff --git a/trunk/arch/arm/mach-omap1/board-htcherald.c b/trunk/arch/arm/mach-omap1/board-htcherald.c
@@ -44,10 +44,10 @@
 #include <plat/omap7xx.h>
 #include <plat/board.h>
 #include <plat/keypad.h>
+#include <plat/usb.h>
 #include <plat/mmc.h>
 
 #include <mach/irqs.h>
-#include <mach/usb.h>
 
 #include "common.h"
 

diff --git a/trunk/arch/arm/mach-omap1/board-innovator.c b/trunk/arch/arm/mach-omap1/board-innovator.c
@@ -35,11 +35,11 @@
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/tc.h>
+#include <plat/usb.h>
 #include <plat/keypad.h>
 #include <plat/mmc.h>
 
 #include <mach/hardware.h>
-#include <mach/usb.h>
 
 #include "iomap.h"
 #include "common.h"

diff --git a/trunk/arch/arm/mach-omap1/board-nokia770.c b/trunk/arch/arm/mach-omap1/board-nokia770.c
@@ -26,14 +26,14 @@
 #include <asm/mach/map.h>
 
 #include <plat/mux.h>
+#include <plat/usb.h>
 #include <plat/board.h>
 #include <plat/keypad.h>
 #include <plat/lcd_mipid.h>
 #include <plat/mmc.h>
 #include <plat/clock.h>
 
 #include <mach/hardware.h>
-#include <mach/usb.h>
 
 #include "common.h"
 

diff --git a/trunk/arch/arm/mach-omap1/board-osk.c b/trunk/arch/arm/mach-omap1/board-osk.c
@@ -45,11 +45,11 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
+#include <plat/usb.h>
 #include <plat/mux.h>
 #include <plat/tc.h>
 
 #include <mach/hardware.h>
-#include <mach/usb.h>
 
 #include "common.h"
 

diff --git a/trunk/arch/arm/mach-omap1/board-palmte.c b/trunk/arch/arm/mach-omap1/board-palmte.c
@@ -35,14 +35,14 @@
 
 #include <plat/flash.h>
 #include <plat/mux.h>
+#include <plat/usb.h>
 #include <plat/tc.h>
 #include <plat/dma.h>
 #include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
 
 #include <mach/hardware.h>
-#include <mach/usb.h>
 
 #include "common.h"
 

diff --git a/trunk/arch/arm/mach-omap1/board-palmtt.c b/trunk/arch/arm/mach-omap1/board-palmtt.c
@@ -35,14 +35,14 @@
 #include <plat/led.h>
 #include <plat/flash.h>
 #include <plat/mux.h>
+#include <plat/usb.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
 
 #include <mach/hardware.h>
-#include <mach/usb.h>
 
 #include "common.h"
 

diff --git a/trunk/arch/arm/mach-omap1/board-palmz71.c b/trunk/arch/arm/mach-omap1/board-palmz71.c
@@ -37,14 +37,14 @@
 
 #include <plat/flash.h>
 #include <plat/mux.h>
+#include <plat/usb.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
 
 #include <mach/hardware.h>
-#include <mach/usb.h>
 
 #include "common.h"