These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / gadget / udc / lpc32xx_udc.c

diff --git a/kernel/drivers/usb/gadget/udc/lpc32xx_udc.c b/kernel/drivers/usb/gadget/udc/lpc32xx_udc.c
index 3b6a785..00b5006 100644 (file)
--- a/kernel/drivers/usb/gadget/udc/lpc32xx_udc.c
+++ b/kernel/drivers/usb/gadget/udc/lpc32xx_udc.c
@@ -2575,6 +2575,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep0",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 0,
@@ -2586,6 +2588,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep1-int",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 2,
@@ -2597,6 +2601,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep2-bulk",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 4,
@@ -2608,6 +2614,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep3-iso",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 1023,
                .hwep_num_base  = 6,
@@ -2619,6 +2627,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep4-int",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 8,
@@ -2630,6 +2640,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep5-bulk",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 10,
@@ -2641,6 +2653,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep6-iso",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 1023,
                .hwep_num_base  = 12,
@@ -2652,6 +2666,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep7-int",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 14,
@@ -2663,6 +2679,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep8-bulk",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 16,
@@ -2674,6 +2692,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep9-iso",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 1023,
                .hwep_num_base  = 18,
@@ -2685,6 +2705,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep10-int",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 20,
@@ -2696,6 +2718,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep11-bulk",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 22,
@@ -2707,6 +2731,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep12-iso",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 1023,
                .hwep_num_base  = 24,
@@ -2718,6 +2744,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep13-int",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 26,
@@ -2729,6 +2757,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep14-bulk",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 64,
                .hwep_num_base  = 28,
@@ -2740,6 +2770,8 @@ static const struct lpc32xx_udc controller_template = {
                .ep = {
                        .name   = "ep15-bulk",
                        .ops    = &lpc32xx_ep_ops,
+                       .caps   = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                       USB_EP_CAPS_DIR_ALL),
                },
                .maxpacket      = 1023,
                .hwep_num_base  = 30,