Extend USB gadget configuration for MTP + ACM mode.

The usb default value in MCD is MTP + ACM.

Change-Id: I46fb8b450029d061fb53da2e60c168c5a54b1fb6
(cherry picked from commit 6a9dfee0f087d09589556c2a81adc204eb3ffd0b)

diff --git a/hw/usb_gadget_common.c b/hw/usb_gadget_common.c
index 0b7953926a3fcd5d7cbfc57d4a8fc0cb397a5c23..368077a130ac4d10330dac392624f80c2fd310e3 100644 (file)
--- a/hw/usb_gadget_common.c
+++ b/hw/usb_gadget_common.c
@@ -255,6 +255,14 @@ static int simple_id_to_gadget(struct usb_gadget_id *gadget_id,
                gadget->attrs.idProduct = 0x6863;
                break;
 
+       case USB_FUNCTION_MTP | USB_FUNCTION_ACM:
+               n_configs = 1;
+               functions[0][0] = USB_FUNCTION_MTP;
+               functions[0][1] = USB_FUNCTION_ACM;
+               functions[0][2] = 0;
+               gadget->attrs.idProduct = 0x6860;
+               break;
+
        case USB_FUNCTION_ACM | USB_FUNCTION_SDB:
                n_configs = 1;
                functions[0][0] = USB_FUNCTION_ACM;