Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-headers

Conflicts:
	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

diff --cc arch/arm/mach-omap1/clock.c
index 9e74aa664acb1cfd20c785577995c245db640865,1e49eda9b68e3c20e07ce5eb2306c0bd26ec42bc..931f3f6d396b368aacf088431c1a0060c9b3b8ed
--- 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 49e49d0b7cf5a8dc7ce7d308762cf3143f532a5a,df561adbed769df2f2b89d1590445072af62c8fe..3fc6d839fb3a900b47087468eb93cca4433c5a2d
--- 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 d2a419fcfce33fb782bcdc3b0f89c9aaf8888b8a,14c07ee96f80033bba21955b7d6bc64b0ae4bea3..79fd9048fd7952d1acc1aff141205e322fb49119
--- 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 f1df60102a65f050be68d7741048a2bfc70cca85,f8e6288b83568db9eaed666daaa150dc443bcf5b..81871b1c735cd3193358925cb52f1847395eca92
--- 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 2ab267ec3b75e8922e2895a9e001267c27d18e32,52534ba3398434afcf7c2f5c29eaa931f75e85bf..fd80d976872dfc2dfc8ce3d7621c239ae6f1f81c
--- 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 73e2ba9b343ba41b1c7ac74bb57d6cd182a37a3c,435c7bebc2a127592e35822771879a34f0fbcc6c..cf9449bde1865689b22faf21bf581836ac06bde3
--- 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 b5495e41502469bfc662bed017d6400553682f1f,db1e14c85e22db02c525a277d3929c06ddc83d8d..278664731d2cd5506005eae3c8c471fe1c84ea4a
--- 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 3eedb8fd037040ba806dcb7120547e563d6f1c24,8df2720c42477507e43bed2d03c6b88025202727..933479e36737c2cec7c189765b43e08de6181097
--- 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 9a9a9b5f78b6362cdea5347a0e035d8f69749cf7,62da89fd42c7a38073d1b723a2e72b64f24b58b5..dbc705ac4334222d6da12754871ad4feef100ae9
--- 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 35ee018d9289603484ec4d3fc34ca78c93315732,8d9406b17c6a87f41e563fbec2dccd5105748328..1164b1061038156a80089b9178b61bdb863374e4
--- 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 a5497ce0a6c80e5fc6eb1782f1cc02f4104da925,33a5f58e8d928d37b17f9a3bf56064eeab2c3967..85c09a09c5e38d8936f7a31376c30000e915152e
--- 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 6f58cad5bf740fadcda81925f754fd467625418b,a0d8fe1ec499fb3c9ab39931c128d2f0213cd8e2..e84e2a875378134aaae80b8416c7edc9aea76aa5
--- 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 3c83b9fbff4558f65cb5575b510b53899c149086,4343fb622012be8e3d13d89bceca9d6ee5f6cc78..ba1124538b9c3f8c2cc7e5b1b8a54e111cc0116d
--- 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 cd282ae0856b619933474fc68a179aa319062f58,c26c9587bce21114125cd3f5a2fbcda7210c9915..a225d819633fd2a3b7a8231332d65da04cf35341
--- 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 e9ce9fb9ffaccfdcb0d6bcfead798a6746e4591b,3f0b92afd9572e9f40f801b92f1e94e531f77c06..8c00b99cd2a315821f1784c6891b9065385a5b66
--- 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 3a9d1fa8bebdcac42ff3870450ffe9a52e4c11e4,0eed6da2869264d4bb97291bddc5a5621cce65ff..1cfb0374f5e27e3564d06a4ef47ed931e875abb9
--- 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 d0a33130aaaf0113695eb1ff59f27c6b57936e24,d55a9831b45818cd3499f85c7954316840183de1..1997e0e722a1551d2d13b97f1c706d942a86c9ea
--- 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 63b33c63bd94c418a1304175f602c4ba37cadd5b,c2f8f6c16b8f5164139785d1fa9a58221ade851b..c388aec14799ae68cc2bd8086b8e45c4beef5be6
--- 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 74ac565ca9d05a38bc78c4ca948bb1c3f3c32d0b,ce923b7c600d86aafcbd726c14d2b056278b309e..26e07addc9d72b1c5540c1020043d171fe00a211
--- 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 50e98795b09cb07436d282d0d987cb9b08fae991,6e1afaeebfab9ad7647fdbe0ac5aace083fd474c..8feb4d99b96d75deaac16392887e9eaf1801930d
--- 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 c85022ab22d559f73bc9836a2dd49ca895113461,fa2f4c9ed1ffd877c5c9c0060c831b4f6e769534..c925c805969fd5997711655ef283f06adc6a9d5e
--- 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 1a0739d397f37181d1a7d4eb9da4facd666d3c5f,1131d4720f3b1cb1a3863a3266642ccd65962851..827f54a1dd1d6fdb0deff2549bcd0ef65aea12d2
--- 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 4fe67129643d31e51354edf006ff1a1302f8628f,b1cf8c8cafdc3f601b756bc5935f7b9445111db4..d1dbe125b34fa343e5aab112f060429096045fbf
--- 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 07f385a2900c1971f06e56c5283145aba1491cda,faf473fd8b50a724438f3cad00e8b4e06dc41471..7b33b375fe77d0f816268b0ce0e8f2f189203d3f
--- 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