---

yaml --- r: 354721 b: refs/heads/master c: fa1dfe4 h: refs/heads/master i: 354719: 92e68d6 v: v3
git-mirror · Feb 6, 2013 · 9f7df14 · 9f7df14
1 parent 868bd8b
commit 9f7df14
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36273356b21b212bce97eafd682d6bffe6aa112d
+refs/heads/master: fa1dfe4abe7f3e1d28ee80753acd9a8a87dbacd7
diff --git a/trunk/arch/arm/mach-omap2/usb-musb.c b/trunk/arch/arm/mach-omap2/usb-musb.c
@@ -85,6 +85,9 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
 	musb_plat.mode = board_data->mode;
 	musb_plat.extvbus = board_data->extvbus;
 
+	if (cpu_is_omap44xx())
+		musb_plat.has_mailbox = true;
+
 	if (soc_is_am35xx()) {
 		oh_name = "am35x_otg_hs";
 		name = "musb-am35x";

diff --git a/trunk/include/linux/usb/musb.h b/trunk/include/linux/usb/musb.h
@@ -99,6 +99,8 @@ struct musb_hdrc_platform_data {
 	/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */
 	u8		mode;
 
+	u8		has_mailbox:1;
+
 	/* for clk_get() */
 	const char	*clock;