diff options
author | Kishon Vijay Abraham I <kishon@ti.com> | 2013-02-06 08:28:49 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-06 14:40:13 -0500 |
commit | fa1dfe4abe7f3e1d28ee80753acd9a8a87dbacd7 (patch) | |
tree | eeb30a8bd0187bcf55db714dc113939880ca8717 | |
parent | 36273356b21b212bce97eafd682d6bffe6aa112d (diff) |
ARM: OMAP2: MUSB: Specify omap4 has mailbox
Added has_mailbox to the musb platform data to specify that omap uses
an external mailbox (in control module) to communicate with the musb
core during device connect and disconnect.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 3 | ||||
-rw-r--r-- | include/linux/usb/musb.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 7b33b375fe77..9d27e3f8a09c 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c | |||
@@ -85,6 +85,9 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) | |||
85 | musb_plat.mode = board_data->mode; | 85 | musb_plat.mode = board_data->mode; |
86 | musb_plat.extvbus = board_data->extvbus; | 86 | musb_plat.extvbus = board_data->extvbus; |
87 | 87 | ||
88 | if (cpu_is_omap44xx()) | ||
89 | musb_plat.has_mailbox = true; | ||
90 | |||
88 | if (soc_is_am35xx()) { | 91 | if (soc_is_am35xx()) { |
89 | oh_name = "am35x_otg_hs"; | 92 | oh_name = "am35x_otg_hs"; |
90 | name = "musb-am35x"; | 93 | name = "musb-am35x"; |
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h index eb505250940a..053c26841cc3 100644 --- a/include/linux/usb/musb.h +++ b/include/linux/usb/musb.h | |||
@@ -99,6 +99,8 @@ struct musb_hdrc_platform_data { | |||
99 | /* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ | 99 | /* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ |
100 | u8 mode; | 100 | u8 mode; |
101 | 101 | ||
102 | u8 has_mailbox:1; | ||
103 | |||
102 | /* for clk_get() */ | 104 | /* for clk_get() */ |
103 | const char *clock; | 105 | const char *clock; |
104 | 106 | ||