aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuchika Kharwar2013-04-29 11:37:10 -0500
committerPraneeth Bajjuri2013-07-19 13:24:58 -0500
commit4f582f11f70280881ad637e4935860b3081dc093 (patch)
tree86752065d0b02e655306ddde15dcce7a1148f859 /include
parent32c7ab14c9d8ea7fe8c11737a5d219d02193c780 (diff)
downloadkernel-video-4f582f11f70280881ad637e4935860b3081dc093.tar.gz
kernel-video-4f582f11f70280881ad637e4935860b3081dc093.tar.xz
kernel-video-4f582f11f70280881ad637e4935860b3081dc093.zip
android: usb: gadget: Allow kernel boot with android gadget.
This patch allows a kernel with android gadget enabled to boot. Issues fixed: - Allows the android gadget probe to get deferred if a udc gadget is unavailable. - Check added for udc gadget availability first before "any" android initialization. Change-Id: If6c46d32a32994367d95a57af1e231beafa7bb8a Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb/composite.h1
-rw-r--r--include/linux/usb/gadget.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index b09c37e04a9..8e863b3e802 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -313,6 +313,7 @@ struct usb_composite_driver {
313 struct usb_gadget_driver gadget_driver; 313 struct usb_gadget_driver gadget_driver;
314}; 314};
315 315
316extern int usb_composite_probe_ready(struct usb_composite_driver *driver);
316extern int usb_composite_probe(struct usb_composite_driver *driver); 317extern int usb_composite_probe(struct usb_composite_driver *driver);
317extern void usb_composite_unregister(struct usb_composite_driver *driver); 318extern void usb_composite_unregister(struct usb_composite_driver *driver);
318extern void usb_composite_setup_continue(struct usb_composite_dev *cdev); 319extern void usb_composite_setup_continue(struct usb_composite_dev *cdev);
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 0af6569b8cc..29ae631d8a9 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -880,6 +880,8 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver);
880 880
881extern int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget); 881extern int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget);
882extern void usb_del_gadget_udc(struct usb_gadget *gadget); 882extern void usb_del_gadget_udc(struct usb_gadget *gadget);
883extern int usb_gadget_probe_driver_ready(struct usb_gadget_driver *driver);
884
883 885
884/*-------------------------------------------------------------------------*/ 886/*-------------------------------------------------------------------------*/
885 887