diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:23:31 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:23:31 +0100 |
| commit | f12e83d998914dc248f5bf290cf18467d216fe08 (patch) | |
| tree | ef7eb06754c4ad86b66f679adb111aad69c5688a /include | |
| parent | c9f2b2b3e3abea48315a2e2b7f5d2d0c94c9985a (diff) | |
| parent | cadb8fb6ed8caa6408e5ed6dfebcdd9100a660ba (diff) | |
Merge topic branch 'usb' into integration-linux-ux500-3.3
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/abx500/ab8500.h | 1 | ||||
| -rw-r--r-- | include/linux/usb.h | 8 | ||||
| -rw-r--r-- | include/linux/usb/gadget.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/otg.h | 3 |
4 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 106fe2d24fb..d3a50db5003 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h @@ -210,6 +210,7 @@ struct ab8500_platform_data { struct ab8500_chargalg_platform_data *chargalg; struct ab8500_gpio_platform_data *gpio; struct ab8500_sysctrl_platform_data *sysctrl; + struct abx500_usbgpio_platform_data *usb; }; extern int __devinit ab8500_init(struct ab8500 *ab8500); diff --git a/include/linux/usb.h b/include/linux/usb.h index 69d845739bc..25c1cbf75d8 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -372,7 +372,15 @@ struct usb_bus { * limit. Because the arrays need to add a bit for hub status data, we * do 31, so plus one evens out to four bytes. */ + +#ifdef CONFIG_ARCH_U8500 +/** +* On U8500 platform we support 16 ports only +*/ +#define USB_MAXCHILDREN (16) +#else #define USB_MAXCHILDREN (31) +#endif struct usb_tt; diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index da653b5c713..e5c900a3d94 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -476,6 +476,8 @@ struct usb_gadget_ops { int (*start)(struct usb_gadget_driver *, int (*bind)(struct usb_gadget *)); int (*stop)(struct usb_gadget_driver *); + struct usb_ep* (*configure_ep)(struct usb_gadget *, u8 type, + struct usb_endpoint_descriptor *); }; /** diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index d87f44f5b04..010b40d1b52 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -41,6 +41,9 @@ enum usb_xceiv_events { USB_EVENT_ID, /* id was grounded */ USB_EVENT_CHARGER, /* usb dedicated charger */ USB_EVENT_ENUMERATED, /* gadget driver enumerated */ + USB_EVENT_RIDA, + USB_EVENT_RIDB, + USB_EVENT_RIDC, }; struct otg_transceiver; |