Merge branch 'depends/omap-cleanup-headers-usb' into next/headers

Conflicts resolved same as Tony did in his later dependent branch:

	arch/arm/mach-omap1/clock.c
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-cm-t35.c
	arch/arm/mach-omap2/board-igep0020.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-omap2/board-omap3logic.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/board-overo.c
	arch/arm/mach-omap2/board-rm680.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/twl-common.c
	arch/arm/mach-omap2/usb-host.c
	arch/arm/mach-omap2/usb-musb.c

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

diff --cc arch/arm/mach-omap1/clock.c
index 9e74aa6,1e49eda..931f3f6
--- 1/arch/arm/mach-omap1/clock.c
--- 2/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@@ -22,13 -21,13 +22,11 @@@
  
  #include <asm/mach-types.h>
  
- #include "soc.h"
- #include <plat/usb.h>
 -#include <plat/cpu.h>
 -#include <plat/clock.h>
 -#include <plat/sram.h>
 -#include <plat/clkdev_omap.h>
--
  #include <mach/hardware.h>
  
 +#include "../plat-omap/sram.h"
 +
++#include "soc.h"
  #include "iomap.h"
  #include "clock.h"
  #include "opp.h"

diff --cc arch/arm/mach-omap2/board-2430sdp.c
index 49e49d0,df561ad..3fc6d83
--- 1/arch/arm/mach-omap2/board-2430sdp.c
--- 2/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -34,8 -34,7 +34,7 @@@
  #include <asm/mach/map.h>
  
  #include "common.h"
 -#include <plat/gpmc.h>
 +#include "gpmc.h"
- #include <plat/usb.h>
  #include "gpmc-smc91x.h"
  
  #include <video/omapdss.h>

diff --cc arch/arm/mach-omap2/board-3430sdp.c
index d2a419f,14c07ee..79fd904
--- 1/arch/arm/mach-omap2/board-3430sdp.c
--- 2/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -30,9 -30,9 +30,8 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <plat/usb.h>
  #include "common.h"
 -#include <plat/dma.h>
 -#include <plat/gpmc.h>
 +#include <plat-omap/dma-omap.h>
  #include <video/omapdss.h>
  #include <video/omap-panel-tfp410.h>
  

diff --cc arch/arm/mach-omap2/board-3630sdp.c
index f1df601,f8e6288..81871b1
--- 1/arch/arm/mach-omap2/board-3630sdp.c
--- 2/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@@ -18,9 -18,8 +18,8 @@@
  
  #include "common.h"
  #include "gpmc-smc91x.h"
- #include <plat/usb.h>
  
 -#include <mach/board-zoom.h>
 +#include "board-zoom.h"
  
  #include "board-flash.h"
  #include "mux.h"

diff --cc arch/arm/mach-omap2/board-4430sdp.c
index 2ab267e,52534ba..fd80d97
--- 1/arch/arm/mach-omap2/board-4430sdp.c
--- 2/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -34,7 -35,7 +35,6 @@@
  #include <asm/mach/map.h>
  
  #include "common.h"
- #include <plat/usb.h>
 -#include <plat/mmc.h>
  #include "omap4-keypad.h"
  #include <video/omapdss.h>
  #include <video/omap-panel-nokia-dsi.h>

diff --cc arch/arm/mach-omap2/board-cm-t35.c
index 73e2ba9,435c7be..cf9449b
--- 1/arch/arm/mach-omap2/board-cm-t35.c
--- 2/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@@ -38,10 -38,9 +38,7 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
--#include "common.h"
  #include <linux/platform_data/mtd-nand-omap2.h>
- #include "gpmc.h"
- #include <plat/usb.h>
 -#include <plat/gpmc.h>
  #include <video/omapdss.h>
  #include <video/omap-panel-generic-dpi.h>
  #include <video/omap-panel-tfp410.h>
@@@ -49,11 -48,10 +46,13 @@@
  
  #include <mach/hardware.h>
  
++#include "common.h"
  #include "mux.h"
  #include "sdram-micron-mt46h32m32lf-6.h"
  #include "hsmmc.h"
  #include "common-board-devices.h"
++#include "gpmc.h"
 +#include "gpmc-nand.h"
  
  #define CM_T35_GPIO_PENDOWN           57
  #define SB_T35_USB_HUB_RESET_GPIO     167

diff --cc arch/arm/mach-omap2/board-cm-t3517.c
index b5495e4,db1e14c..2786647
--- 1/arch/arm/mach-omap2/board-cm-t3517.c
--- 2/arch/arm/mach-omap2/board-cm-t3517.c
+++ b/arch/arm/mach-omap2/board-cm-t3517.c
@@@ -39,9 -39,8 +39,8 @@@
  #include <asm/mach/map.h>
  
  #include "common.h"
- #include <plat/usb.h>
  #include <linux/platform_data/mtd-nand-omap2.h>
 -#include <plat/gpmc.h>
 +#include "gpmc.h"
  
  #include "am35xx.h"
  

diff --cc arch/arm/mach-omap2/board-devkit8000.c
index 3eedb8f,8df2720..933479e
--- 1/arch/arm/mach-omap2/board-devkit8000.c
--- 2/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@@ -39,9 -39,8 +39,8 @@@
  #include <asm/mach/flash.h>
  
  #include "common.h"
 -#include <plat/gpmc.h>
 +#include "gpmc.h"
  #include <linux/platform_data/mtd-nand-omap2.h>
- #include <plat/usb.h>
  #include <video/omapdss.h>
  #include <video/omap-panel-generic-dpi.h>
  #include <video/omap-panel-tfp410.h>

diff --cc arch/arm/mach-omap2/board-igep0020.c
index 9a9a9b5,62da89f..dbc705a
--- 1/arch/arm/mach-omap2/board-igep0020.c
--- 2/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@@ -29,14 -29,13 +29,12 @@@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  
--#include "common.h"
- #include "gpmc.h"
- #include <plat/usb.h>
 -#include <plat/gpmc.h>
--
  #include <video/omapdss.h>
  #include <video/omap-panel-tfp410.h>
  #include <linux/platform_data/mtd-onenand-omap2.h>
  
++#include "common.h"
++#include "gpmc.h"
  #include "mux.h"
  #include "hsmmc.h"
  #include "sdram-numonyx-m65kxxxxam.h"

diff --cc arch/arm/mach-omap2/board-ldp.c
index 35ee018,8d9406b..1164b10
--- 1/arch/arm/mach-omap2/board-ldp.c
--- 2/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -35,9 -35,8 +35,8 @@@
  #include <asm/mach/map.h>
  
  #include "common.h"
- #include "gpmc.h"
 -#include <plat/gpmc.h>
 -#include <mach/board-zoom.h>
 +#include "board-zoom.h"
- #include <plat/usb.h>
++#include "gpmc.h"
  #include "gpmc-smsc911x.h"
  
  #include <video/omapdss.h>

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index a5497ce,33a5f58..85c09a0
--- 1/arch/arm/mach-omap2/board-omap3beagle.c
--- 2/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -38,15 -38,13 +38,14 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/flash.h>
  
--#include "common.h"
  #include <video/omapdss.h>
  #include <video/omap-panel-tfp410.h>
- #include "gpmc.h"
 -#include <plat/gpmc.h>
  #include <linux/platform_data/mtd-nand-omap2.h>
- #include <plat/usb.h>
- #include "omap_device.h"
 -#include <plat/omap_device.h>
  
++#include "common.h"
++#include "omap_device.h"
++#include "gpmc.h"
 +#include "soc.h"
  #include "mux.h"
  #include "hsmmc.h"
  #include "pm.h"

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3logic.c
index 6f58cad,a0d8fe1..e84e2a8
--- 1/arch/arm/mach-omap2/board-omap3logic.c
--- 2/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@@ -34,8 -34,10 +34,6 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <plat/usb.h>
 -#include "gpmc-smsc911x.h"
 -#include <plat/gpmc.h>
 -#include <plat/sdrc.h>
--
  #include "common.h"
  #include "mux.h"
  #include "hsmmc.h"

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3stalker.c
index 3c83b9f,4343fb6..ba11245
--- 1/arch/arm/mach-omap2/board-omap3stalker.c
--- 2/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@@ -40,9 -40,8 +40,8 @@@
  #include <asm/mach/flash.h>
  
  #include "common.h"
 -#include <plat/gpmc.h>
 +#include "gpmc.h"
  #include <linux/platform_data/mtd-nand-omap2.h>
- #include <plat/usb.h>
  #include <video/omapdss.h>
  #include <video/omap-panel-generic-dpi.h>
  #include <video/omap-panel-tfp410.h>

diff --cc arch/arm/mach-omap2/board-omap3touchbook.c
index cd282ae,c26c958..a225d81
--- 1/arch/arm/mach-omap2/board-omap3touchbook.c
--- 2/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@@ -44,9 -44,8 +44,8 @@@
  #include <asm/system_info.h>
  
  #include "common.h"
 -#include <plat/gpmc.h>
 +#include "gpmc.h"
  #include <linux/platform_data/mtd-nand-omap2.h>
- #include <plat/usb.h>
  
  #include "mux.h"
  #include "hsmmc.h"

diff --cc arch/arm/mach-omap2/board-omap4panda.c
index e9ce9fb,3f0b92a..8c00b99
--- 1/arch/arm/mach-omap2/board-omap4panda.c
--- 2/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -38,12 -39,11 +39,11 @@@
  #include <asm/mach/map.h>
  #include <video/omapdss.h>
  
--#include "common.h"
- #include <plat/usb.h>
 -#include <plat/mmc.h>
  #include <video/omap-panel-tfp410.h>
  
++#include "common.h"
  #include "soc.h"
 +#include "mmc.h"
  #include "hsmmc.h"
  #include "control.h"
  #include "mux.h"

diff --cc arch/arm/mach-omap2/board-overo.c
index 3a9d1fa,0eed6da..1cfb037
--- 1/arch/arm/mach-omap2/board-overo.c
--- 2/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@@ -49,17 -49,13 +49,17 @@@
  #include <video/omapdss.h>
  #include <video/omap-panel-generic-dpi.h>
  #include <video/omap-panel-tfp410.h>
- #include "gpmc.h"
- #include <plat/usb.h>
 -#include <plat/gpmc.h>
  
++#include "common.h"
  #include "mux.h"
  #include "sdram-micron-mt46h32m32lf-6.h"
++#include "gpmc.h"
  #include "hsmmc.h"
 +#include "board-flash.h"
  #include "common-board-devices.h"
  
 +#define       NAND_CS                 0
 +
  #define OVERO_GPIO_BT_XGATE   15
  #define OVERO_GPIO_W2W_NRESET 16
  #define OVERO_GPIO_PENDOWN    114

diff --cc arch/arm/mach-omap2/board-rm680.c
index d0a3313,d55a983..1997e0e
--- 1/arch/arm/mach-omap2/board-rm680.c
--- 2/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@@ -22,12 -22,13 +22,10 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  
- #include <plat/usb.h>
- #include "gpmc.h"
 -#include <plat/i2c.h>
 -#include <plat/mmc.h>
 -#include <plat/gpmc.h>
  #include "common.h"
 -#include <plat/serial.h>
--
  #include "mux.h"
++#include "gpmc.h"
 +#include "mmc.h"
  #include "hsmmc.h"
  #include "sdram-nokia.h"
  #include "common-board-devices.h"

diff --cc arch/arm/mach-omap2/board-rx51.c
index 63b33c6,c2f8f6c..c388aec
--- 1/arch/arm/mach-omap2/board-rx51.c
--- 2/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -23,12 -24,11 +24,11 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
 -#include "common.h"
 -#include <plat/dma.h>
 -#include <plat/gpmc.h>
 +#include <plat-omap/dma-omap.h>
- #include <plat/usb.h>
  
 +#include "common.h"
  #include "mux.h"
 +#include "gpmc.h"
  #include "pm.h"
  #include "sdram-nokia.h"
  

diff --cc arch/arm/mach-omap2/board-zoom-peripherals.c
index 74ac565,ce923b7..26e07ad
--- 1/arch/arm/mach-omap2/board-zoom-peripherals.c
--- 2/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@@ -26,9 -26,8 +26,8 @@@
  #include <asm/mach/map.h>
  
  #include "common.h"
- #include <plat/usb.h>
  
 -#include <mach/board-zoom.h>
 +#include "board-zoom.h"
  
  #include "mux.h"
  #include "hsmmc.h"

diff --cc arch/arm/mach-omap2/board-zoom.c
index 50e9879,6e1afae..8feb4d9
--- 1/arch/arm/mach-omap2/board-zoom.c
--- 2/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@@ -22,9 -22,8 +22,8 @@@
  #include <asm/mach/arch.h>
  
  #include "common.h"
- #include <plat/usb.h>
  
 -#include <mach/board-zoom.h>
 +#include "board-zoom.h"
  
  #include "board-flash.h"
  #include "mux.h"

diff --cc arch/arm/mach-omap2/common.h
index c85022a,fa2f4c9..c925c80
--- 1/arch/arm/mach-omap2/common.h
--- 2/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@@ -34,11 -32,12 +34,13 @@@
  
  #include <asm/proc-fns.h>
  
 -#include <plat/cpu.h>
 -#include <plat/serial.h>
 -#include <plat/common.h>
 +#include "../plat-omap/common.h"
 +
 +#include "i2c.h"
 +#include "serial.h"
  
+ #include "usb.h"
+ 
  #define OMAP_INTC_START               NR_IRQS
  
  #ifdef CONFIG_SOC_OMAP2420

diff --cc arch/arm/mach-omap2/twl-common.c
index 1a0739d,1131d47..827f54a
--- 1/arch/arm/mach-omap2/twl-common.c
--- 2/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@@ -26,8 -26,8 +26,6 @@@
  #include <linux/regulator/machine.h>
  #include <linux/regulator/fixed.h>
  
- #include <plat/usb.h>
 -#include <plat/i2c.h>
--
  #include "soc.h"
  #include "twl-common.h"
  #include "pm.h"

diff --cc arch/arm/mach-omap2/usb-host.c
index 4fe6712,b1cf8c8..d1dbe12
--- 1/arch/arm/mach-omap2/usb-host.c
--- 2/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@@ -25,11 -25,10 +25,10 @@@
  
  #include <asm/io.h>
  
- #include <plat/usb.h>
 -#include <plat/omap_device.h>
 -
 +#include "soc.h"
 +#include "omap_device.h"
- 
  #include "mux.h"
+ #include "usb.h"
  
  #ifdef CONFIG_MFD_OMAP_USB_HOST
  

diff --cc arch/arm/mach-omap2/usb-musb.c
index 07f385a,faf473f..7b33b37
--- 1/arch/arm/mach-omap2/usb-musb.c
--- 2/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@@ -25,11 -25,12 +25,10 @@@
  #include <linux/io.h>
  #include <linux/usb/musb.h>
  
- #include <plat/usb.h>
 -#include <plat/omap_device.h>
 -
 -#include "am35xx.h"
 -
 +#include "omap_device.h"
- 
 +#include "soc.h"
  #include "mux.h"
+ #include "usb.h"
  
  static struct musb_hdrc_config musb_config = {
        .multipoint     = 1,

diff --cc arch/arm/mach-omap2/usb-tusb6010.c
Simple merge