---

yaml --- r: 313055 b: refs/heads/master c: bedfb7a h: refs/heads/master i: 313053: 5057acd 313051: 9d1bbde 313047: 7d4d3f4 313039: f3b0784 313023: 36ff507 v: v3
git-mirror · Jun 4, 2012 · 46ce5d5 · 46ce5d5
1 parent 364442d
commit 46ce5d5
Show file tree

Hide file tree

Showing 33 changed files with 836 additions and 342 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b924b2047045844644e04b3c6e8308b2114afe7e
+refs/heads/master: bedfb7adc7f7e2f344b21584905b2357147ba27e
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"
 

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

diff --git a/trunk/arch/arm/mach-omap1/board-voiceblue.c b/trunk/arch/arm/mach-omap1/board-voiceblue.c
@@ -35,10 +35,9 @@
 #include <plat/flash.h>
 #include <plat/mux.h>
 #include <plat/tc.h>
-#include <plat/board.h>
+#include <plat/usb.h>
 
 #include <mach/hardware.h>
-#include <mach/usb.h>
 
 #include "common.h"
 

diff --git a/trunk/arch/arm/mach-omap1/clock_data.c b/trunk/arch/arm/mach-omap1/clock_data.c
@@ -25,11 +25,10 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/clkdev_omap.h>
-#include <plat/board.h>
 #include <plat/sram.h>	/* for omap_sram_reprogram_clock() */
+#include <plat/usb.h>   /* for OTG_BASE */
 
 #include <mach/hardware.h>
-#include <mach/usb.h>   /* for OTG_BASE */
 
 #include "iomap.h"
 #include "clock.h"

diff --git a/trunk/arch/arm/mach-omap1/include/mach/usb.h b/trunk/arch/arm/mach-omap1/include/mach/usb.h