diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-24 17:26:18 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-24 17:26:18 -0400 |
commit | 54db6eee06b51278a79e007765151fb5e71c370c (patch) | |
tree | b723f0ceff0b2e176d886373943b5593774b0d76 /arch/arm/mach-omap2 | |
parent | 6f0c0580b70c89094b3422ba81118c7b959c7556 (diff) |
ARM: OMAP2+: Introduce local usb.h
Let's move what we can from plat/usb.h to the local usb.h
for ARM common zImage support.
This is needed so we can remove plat/usb.h for ARM common
zImage support.
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Partha Basak <parthab@india.ti.com>
Cc: Keshava Munegowda <keshava_mgowda@ti.com>
Cc: linux-usb@vger.kernel.org
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
30 files changed, 88 insertions, 29 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 95b384d54f8a..df561adbed76 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include <plat/gpmc.h> | 37 | #include <plat/gpmc.h> |
38 | #include <plat/usb.h> | ||
39 | #include "gpmc-smc91x.h" | 38 | #include "gpmc-smc91x.h" |
40 | 39 | ||
41 | #include <video/omapdss.h> | 40 | #include <video/omapdss.h> |
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 96cd3693e1ae..14c07ee96f80 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
32 | 32 | ||
33 | #include <plat/usb.h> | ||
34 | #include "common.h" | 33 | #include "common.h" |
35 | #include <plat/dma.h> | 34 | #include <plat/dma.h> |
36 | #include <plat/gpmc.h> | 35 | #include <plat/gpmc.h> |
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index fc224ad86747..f8e6288b8356 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include "common.h" | 19 | #include "common.h" |
20 | #include "gpmc-smc91x.h" | 20 | #include "gpmc-smc91x.h" |
21 | #include <plat/usb.h> | ||
22 | 21 | ||
23 | #include <mach/board-zoom.h> | 22 | #include <mach/board-zoom.h> |
24 | 23 | ||
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 3669c120c7e8..5700fc5b77a2 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include <plat/usb.h> | ||
38 | #include <plat/mmc.h> | 37 | #include <plat/mmc.h> |
39 | #include "omap4-keypad.h" | 38 | #include "omap4-keypad.h" |
40 | #include <video/omapdss.h> | 39 | #include <video/omapdss.h> |
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c index 318feadb1d6e..603503c587b7 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
27 | 27 | ||
28 | #include "common.h" | 28 | #include "common.h" |
29 | #include <plat/usb.h> | ||
30 | 29 | ||
31 | #include "am35xx-emac.h" | 30 | #include "am35xx-emac.h" |
32 | #include "mux.h" | 31 | #include "mux.h" |
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index e16289755f2e..0dbeb77aad68 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include <plat/usb.h> | ||
37 | #include <video/omapdss.h> | 36 | #include <video/omapdss.h> |
38 | #include <video/omap-panel-generic-dpi.h> | 37 | #include <video/omap-panel-generic-dpi.h> |
39 | #include <video/omap-panel-tfp410.h> | 38 | #include <video/omap-panel-tfp410.h> |
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 376d26eb601c..435c7bebc2a1 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include "common.h" | 41 | #include "common.h" |
42 | #include <linux/platform_data/mtd-nand-omap2.h> | 42 | #include <linux/platform_data/mtd-nand-omap2.h> |
43 | #include <plat/gpmc.h> | 43 | #include <plat/gpmc.h> |
44 | #include <plat/usb.h> | ||
45 | #include <video/omapdss.h> | 44 | #include <video/omapdss.h> |
46 | #include <video/omap-panel-generic-dpi.h> | 45 | #include <video/omap-panel-generic-dpi.h> |
47 | #include <video/omap-panel-tfp410.h> | 46 | #include <video/omap-panel-tfp410.h> |
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 59c0a45f75b0..db1e14c85e22 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <asm/mach/map.h> | 39 | #include <asm/mach/map.h> |
40 | 40 | ||
41 | #include "common.h" | 41 | #include "common.h" |
42 | #include <plat/usb.h> | ||
43 | #include <linux/platform_data/mtd-nand-omap2.h> | 42 | #include <linux/platform_data/mtd-nand-omap2.h> |
44 | #include <plat/gpmc.h> | 43 | #include <plat/gpmc.h> |
45 | 44 | ||
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 1fd161e934c7..8df2720c4247 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include "common.h" | 41 | #include "common.h" |
42 | #include <plat/gpmc.h> | 42 | #include <plat/gpmc.h> |
43 | #include <linux/platform_data/mtd-nand-omap2.h> | 43 | #include <linux/platform_data/mtd-nand-omap2.h> |
44 | #include <plat/usb.h> | ||
45 | #include <video/omapdss.h> | 44 | #include <video/omapdss.h> |
46 | #include <video/omap-panel-generic-dpi.h> | 45 | #include <video/omap-panel-generic-dpi.h> |
47 | #include <video/omap-panel-tfp410.h> | 46 | #include <video/omap-panel-tfp410.h> |
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 48d5e41dfbfa..62da89fd42c7 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
@@ -31,7 +31,6 @@ | |||
31 | 31 | ||
32 | #include "common.h" | 32 | #include "common.h" |
33 | #include <plat/gpmc.h> | 33 | #include <plat/gpmc.h> |
34 | #include <plat/usb.h> | ||
35 | 34 | ||
36 | #include <video/omapdss.h> | 35 | #include <video/omapdss.h> |
37 | #include <video/omap-panel-tfp410.h> | 36 | #include <video/omap-panel-tfp410.h> |
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index ee8c3cfb95b3..8d9406b17c6a 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include "common.h" | 37 | #include "common.h" |
38 | #include <plat/gpmc.h> | 38 | #include <plat/gpmc.h> |
39 | #include <mach/board-zoom.h> | 39 | #include <mach/board-zoom.h> |
40 | #include <plat/usb.h> | ||
41 | #include "gpmc-smsc911x.h" | 40 | #include "gpmc-smsc911x.h" |
42 | 41 | ||
43 | #include <video/omapdss.h> | 42 | #include <video/omapdss.h> |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 388c431c745a..33a5f58e8d92 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <video/omap-panel-tfp410.h> | 43 | #include <video/omap-panel-tfp410.h> |
44 | #include <plat/gpmc.h> | 44 | #include <plat/gpmc.h> |
45 | #include <linux/platform_data/mtd-nand-omap2.h> | 45 | #include <linux/platform_data/mtd-nand-omap2.h> |
46 | #include <plat/usb.h> | ||
47 | #include <plat/omap_device.h> | 46 | #include <plat/omap_device.h> |
48 | 47 | ||
49 | #include "mux.h" | 48 | #include "mux.h" |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index b9b776b6c954..6e7e69bf5c7e 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <asm/mach/arch.h> | 45 | #include <asm/mach/arch.h> |
46 | #include <asm/mach/map.h> | 46 | #include <asm/mach/map.h> |
47 | 47 | ||
48 | #include <plat/usb.h> | ||
49 | #include <linux/platform_data/mtd-nand-omap2.h> | 48 | #include <linux/platform_data/mtd-nand-omap2.h> |
50 | #include "common.h" | 49 | #include "common.h" |
51 | #include <linux/platform_data/spi-omap2-mcspi.h> | 50 | #include <linux/platform_data/spi-omap2-mcspi.h> |
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 7bd8253b5d1d..a0d8fe1ec499 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include "gpmc-smsc911x.h" | 37 | #include "gpmc-smsc911x.h" |
38 | #include <plat/gpmc.h> | 38 | #include <plat/gpmc.h> |
39 | #include <plat/sdrc.h> | 39 | #include <plat/sdrc.h> |
40 | #include <plat/usb.h> | ||
41 | 40 | ||
42 | #include "common.h" | 41 | #include "common.h" |
43 | #include "mux.h" | 42 | #include "mux.h" |
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 00a1f4ae6e44..f2be51b8a5ca 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include <asm/mach/map.h> | 42 | #include <asm/mach/map.h> |
43 | 43 | ||
44 | #include "common.h" | 44 | #include "common.h" |
45 | #include <plat/usb.h> | ||
46 | #include <video/omapdss.h> | 45 | #include <video/omapdss.h> |
47 | #include <linux/platform_data/mtd-nand-omap2.h> | 46 | #include <linux/platform_data/mtd-nand-omap2.h> |
48 | 47 | ||
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 731235eb319e..4343fb622012 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include "common.h" | 42 | #include "common.h" |
43 | #include <plat/gpmc.h> | 43 | #include <plat/gpmc.h> |
44 | #include <linux/platform_data/mtd-nand-omap2.h> | 44 | #include <linux/platform_data/mtd-nand-omap2.h> |
45 | #include <plat/usb.h> | ||
46 | #include <video/omapdss.h> | 45 | #include <video/omapdss.h> |
47 | #include <video/omap-panel-generic-dpi.h> | 46 | #include <video/omap-panel-generic-dpi.h> |
48 | #include <video/omap-panel-tfp410.h> | 47 | #include <video/omap-panel-tfp410.h> |
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 944ffc436577..c26c9587bce2 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include "common.h" | 46 | #include "common.h" |
47 | #include <plat/gpmc.h> | 47 | #include <plat/gpmc.h> |
48 | #include <linux/platform_data/mtd-nand-omap2.h> | 48 | #include <linux/platform_data/mtd-nand-omap2.h> |
49 | #include <plat/usb.h> | ||
50 | 49 | ||
51 | #include "mux.h" | 50 | #include "mux.h" |
52 | #include "hsmmc.h" | 51 | #include "hsmmc.h" |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index bfcd397e233c..74e39bbb3ca3 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <video/omapdss.h> | 39 | #include <video/omapdss.h> |
40 | 40 | ||
41 | #include "common.h" | 41 | #include "common.h" |
42 | #include <plat/usb.h> | ||
43 | #include <plat/mmc.h> | 42 | #include <plat/mmc.h> |
44 | #include <video/omap-panel-tfp410.h> | 43 | #include <video/omap-panel-tfp410.h> |
45 | 44 | ||
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index b700685762b5..0eed6da28692 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include <video/omap-panel-generic-dpi.h> | 50 | #include <video/omap-panel-generic-dpi.h> |
51 | #include <video/omap-panel-tfp410.h> | 51 | #include <video/omap-panel-tfp410.h> |
52 | #include <plat/gpmc.h> | 52 | #include <plat/gpmc.h> |
53 | #include <plat/usb.h> | ||
54 | 53 | ||
55 | #include "mux.h" | 54 | #include "mux.h" |
56 | #include "sdram-micron-mt46h32m32lf-6.h" | 55 | #include "sdram-micron-mt46h32m32lf-6.h" |
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index 45997bfbcbd2..d55a9831b458 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <plat/i2c.h> | 25 | #include <plat/i2c.h> |
26 | #include <plat/mmc.h> | 26 | #include <plat/mmc.h> |
27 | #include <plat/usb.h> | ||
28 | #include <plat/gpmc.h> | 27 | #include <plat/gpmc.h> |
29 | #include "common.h" | 28 | #include "common.h" |
30 | #include <plat/serial.h> | 29 | #include <plat/serial.h> |
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 7bbb05d9689b..8c4d27ef160b 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "common.h" | 26 | #include "common.h" |
27 | #include <plat/dma.h> | 27 | #include <plat/dma.h> |
28 | #include <plat/gpmc.h> | 28 | #include <plat/gpmc.h> |
29 | #include <plat/usb.h> | ||
30 | 29 | ||
31 | #include "mux.h" | 30 | #include "mux.h" |
32 | #include "pm.h" | 31 | #include "pm.h" |
diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c index c4f8833b4c3c..4977c77ce223 100644 --- a/arch/arm/mach-omap2/board-ti8168evm.c +++ b/arch/arm/mach-omap2/board-ti8168evm.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
21 | 21 | ||
22 | #include "common.h" | 22 | #include "common.h" |
23 | #include <plat/usb.h> | ||
24 | 23 | ||
25 | static struct omap_musb_board_data musb_board_data = { | 24 | static struct omap_musb_board_data musb_board_data = { |
26 | .set_phy_power = ti81xx_musb_phy_power, | 25 | .set_phy_power = ti81xx_musb_phy_power, |
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index c166fe1fdff9..ce923b7c600d 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
27 | 27 | ||
28 | #include "common.h" | 28 | #include "common.h" |
29 | #include <plat/usb.h> | ||
30 | 29 | ||
31 | #include <mach/board-zoom.h> | 30 | #include <mach/board-zoom.h> |
32 | 31 | ||
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index 4994438e1f46..6e1afaeebfab 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
23 | 23 | ||
24 | #include "common.h" | 24 | #include "common.h" |
25 | #include <plat/usb.h> | ||
26 | 25 | ||
27 | #include <mach/board-zoom.h> | 26 | #include <mach/board-zoom.h> |
28 | 27 | ||
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 7045e4d61ac3..fa2f4c9ed1ff 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
@@ -36,6 +36,8 @@ | |||
36 | #include <plat/serial.h> | 36 | #include <plat/serial.h> |
37 | #include <plat/common.h> | 37 | #include <plat/common.h> |
38 | 38 | ||
39 | #include "usb.h" | ||
40 | |||
39 | #define OMAP_INTC_START NR_IRQS | 41 | #define OMAP_INTC_START NR_IRQS |
40 | 42 | ||
41 | #ifdef CONFIG_SOC_OMAP2420 | 43 | #ifdef CONFIG_SOC_OMAP2420 |
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index d992db8ff0b0..4d76a3ca5bf3 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c | |||
@@ -27,11 +27,11 @@ | |||
27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
29 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
30 | 30 | #include <linux/usb/musb.h> | |
31 | #include <plat/usb.h> | ||
32 | 31 | ||
33 | #include "soc.h" | 32 | #include "soc.h" |
34 | #include "control.h" | 33 | #include "control.h" |
34 | #include "usb.h" | ||
35 | 35 | ||
36 | void am35x_musb_reset(void) | 36 | void am35x_musb_reset(void) |
37 | { | 37 | { |
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 635e109f5ad3..1131d4720f3b 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/regulator/fixed.h> | 27 | #include <linux/regulator/fixed.h> |
28 | 28 | ||
29 | #include <plat/i2c.h> | 29 | #include <plat/i2c.h> |
30 | #include <plat/usb.h> | ||
31 | 30 | ||
32 | #include "soc.h" | 31 | #include "soc.h" |
33 | #include "twl-common.h" | 32 | #include "twl-common.h" |
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c index 3c434498e12e..b1cf8c8cafdc 100644 --- a/arch/arm/mach-omap2/usb-host.c +++ b/arch/arm/mach-omap2/usb-host.c | |||
@@ -25,10 +25,10 @@ | |||
25 | 25 | ||
26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
27 | 27 | ||
28 | #include <plat/usb.h> | ||
29 | #include <plat/omap_device.h> | 28 | #include <plat/omap_device.h> |
30 | 29 | ||
31 | #include "mux.h" | 30 | #include "mux.h" |
31 | #include "usb.h" | ||
32 | 32 | ||
33 | #ifdef CONFIG_MFD_OMAP_USB_HOST | 33 | #ifdef CONFIG_MFD_OMAP_USB_HOST |
34 | 34 | ||
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 51da21cb78f1..faf473fd8b50 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c | |||
@@ -25,12 +25,12 @@ | |||
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | #include <linux/usb/musb.h> | 26 | #include <linux/usb/musb.h> |
27 | 27 | ||
28 | #include <plat/usb.h> | ||
29 | #include <plat/omap_device.h> | 28 | #include <plat/omap_device.h> |
30 | 29 | ||
31 | #include "am35xx.h" | 30 | #include "am35xx.h" |
32 | 31 | ||
33 | #include "mux.h" | 32 | #include "mux.h" |
33 | #include "usb.h" | ||
34 | 34 | ||
35 | static struct musb_hdrc_config musb_config = { | 35 | static struct musb_hdrc_config musb_config = { |
36 | .multipoint = 1, | 36 | .multipoint = 1, |
diff --git a/arch/arm/mach-omap2/usb.h b/arch/arm/mach-omap2/usb.h new file mode 100644 index 000000000000..b2c4ff15557e --- /dev/null +++ b/arch/arm/mach-omap2/usb.h | |||
@@ -0,0 +1,82 @@ | |||
1 | #include <plat/usb.h> | ||
2 | |||
3 | /* AM35x */ | ||
4 | /* USB 2.0 PHY Control */ | ||
5 | #define CONF2_PHY_GPIOMODE (1 << 23) | ||
6 | #define CONF2_OTGMODE (3 << 14) | ||
7 | #define CONF2_NO_OVERRIDE (0 << 14) | ||
8 | #define CONF2_FORCE_HOST (1 << 14) | ||
9 | #define CONF2_FORCE_DEVICE (2 << 14) | ||
10 | #define CONF2_FORCE_HOST_VBUS_LOW (3 << 14) | ||
11 | #define CONF2_SESENDEN (1 << 13) | ||
12 | #define CONF2_VBDTCTEN (1 << 12) | ||
13 | #define CONF2_REFFREQ_24MHZ (2 << 8) | ||
14 | #define CONF2_REFFREQ_26MHZ (7 << 8) | ||
15 | #define CONF2_REFFREQ_13MHZ (6 << 8) | ||
16 | #define CONF2_REFFREQ (0xf << 8) | ||
17 | #define CONF2_PHYCLKGD (1 << 7) | ||
18 | #define CONF2_VBUSSENSE (1 << 6) | ||
19 | #define CONF2_PHY_PLLON (1 << 5) | ||
20 | #define CONF2_RESET (1 << 4) | ||
21 | #define CONF2_PHYPWRDN (1 << 3) | ||
22 | #define CONF2_OTGPWRDN (1 << 2) | ||
23 | #define CONF2_DATPOL (1 << 1) | ||
24 | |||
25 | /* TI81XX specific definitions */ | ||
26 | #define USBCTRL0 0x620 | ||
27 | #define USBSTAT0 0x624 | ||
28 | |||
29 | /* TI816X PHY controls bits */ | ||
30 | #define TI816X_USBPHY0_NORMAL_MODE (1 << 0) | ||
31 | #define TI816X_USBPHY_REFCLK_OSC (1 << 8) | ||
32 | |||
33 | /* TI814X PHY controls bits */ | ||
34 | #define USBPHY_CM_PWRDN (1 << 0) | ||
35 | #define USBPHY_OTG_PWRDN (1 << 1) | ||
36 | #define USBPHY_CHGDET_DIS (1 << 2) | ||
37 | #define USBPHY_CHGDET_RSTRT (1 << 3) | ||
38 | #define USBPHY_SRCONDM (1 << 4) | ||
39 | #define USBPHY_SINKONDP (1 << 5) | ||
40 | #define USBPHY_CHGISINK_EN (1 << 6) | ||
41 | #define USBPHY_CHGVSRC_EN (1 << 7) | ||
42 | #define USBPHY_DMPULLUP (1 << 8) | ||
43 | #define USBPHY_DPPULLUP (1 << 9) | ||
44 | #define USBPHY_CDET_EXTCTL (1 << 10) | ||
45 | #define USBPHY_GPIO_MODE (1 << 12) | ||
46 | #define USBPHY_DPOPBUFCTL (1 << 13) | ||
47 | #define USBPHY_DMOPBUFCTL (1 << 14) | ||
48 | #define USBPHY_DPINPUT (1 << 15) | ||
49 | #define USBPHY_DMINPUT (1 << 16) | ||
50 | #define USBPHY_DPGPIO_PD (1 << 17) | ||
51 | #define USBPHY_DMGPIO_PD (1 << 18) | ||
52 | #define USBPHY_OTGVDET_EN (1 << 19) | ||
53 | #define USBPHY_OTGSESSEND_EN (1 << 20) | ||
54 | #define USBPHY_DATA_POLARITY (1 << 23) | ||
55 | |||
56 | struct usbhs_omap_board_data { | ||
57 | enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; | ||
58 | |||
59 | /* have to be valid if phy_reset is true and portx is in phy mode */ | ||
60 | int reset_gpio_port[OMAP3_HS_USB_PORTS]; | ||
61 | |||
62 | /* Set this to true for ES2.x silicon */ | ||
63 | unsigned es2_compatibility:1; | ||
64 | |||
65 | unsigned phy_reset:1; | ||
66 | |||
67 | /* | ||
68 | * Regulators for USB PHYs. | ||
69 | * Each PHY can have a separate regulator. | ||
70 | */ | ||
71 | struct regulator *regulator[OMAP3_HS_USB_PORTS]; | ||
72 | }; | ||
73 | |||
74 | extern void usb_musb_init(struct omap_musb_board_data *board_data); | ||
75 | extern void usbhs_init(const struct usbhs_omap_board_data *pdata); | ||
76 | |||
77 | extern void am35x_musb_reset(void); | ||
78 | extern void am35x_musb_phy_power(u8 on); | ||
79 | extern void am35x_musb_clear_irq(void); | ||
80 | extern void am35x_set_mode(u8 musb_mode); | ||
81 | extern void ti81xx_musb_phy_power(u8 on); | ||
82 | |||