Skip to content

L
linux
Commit 36411b6b authored by Robert Baldyga's avatar Robert Baldyga Committed by Felipe Balbi
Browse files
Options

usb: gadget: pxa25x_udc: add ep capabilities support 

Convert endpoint configuration to new capabilities model.
Signed-off-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 85a4ed00
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 0 deletions
drivers/usb/gadget/udc/pxa25x_udc.c
View file @ 36411b6b
...@@ -1822,6 +1822,8 @@ static struct pxa25x_udc memory = { ...@@ -1822,6 +1822,8 @@ static struct pxa25x_udc memory = {
.name = ep0name, .name = ep0name,
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = EP0_FIFO_SIZE, .maxpacket = EP0_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL,
USB_EP_CAPS_DIR_ALL),
}, },
.dev = &memory, .dev = &memory,
.reg_udccs = &UDCCS0, .reg_udccs = &UDCCS0,
...@@ -1834,6 +1836,8 @@ static struct pxa25x_udc memory = { ...@@ -1834,6 +1836,8 @@ static struct pxa25x_udc memory = {
.name = "ep1in-bulk", .name = "ep1in-bulk",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = BULK_FIFO_SIZE, .fifo_size = BULK_FIFO_SIZE,
...@@ -1847,6 +1851,8 @@ static struct pxa25x_udc memory = { ...@@ -1847,6 +1851,8 @@ static struct pxa25x_udc memory = {
.name = "ep2out-bulk", .name = "ep2out-bulk",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
USB_EP_CAPS_DIR_OUT),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = BULK_FIFO_SIZE, .fifo_size = BULK_FIFO_SIZE,
...@@ -1862,6 +1868,8 @@ static struct pxa25x_udc memory = { ...@@ -1862,6 +1868,8 @@ static struct pxa25x_udc memory = {
.name = "ep3in-iso", .name = "ep3in-iso",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = ISO_FIFO_SIZE, .fifo_size = ISO_FIFO_SIZE,
...@@ -1875,6 +1883,8 @@ static struct pxa25x_udc memory = { ...@@ -1875,6 +1883,8 @@ static struct pxa25x_udc memory = {
.name = "ep4out-iso", .name = "ep4out-iso",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
USB_EP_CAPS_DIR_OUT),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = ISO_FIFO_SIZE, .fifo_size = ISO_FIFO_SIZE,
...@@ -1889,6 +1899,8 @@ static struct pxa25x_udc memory = { ...@@ -1889,6 +1899,8 @@ static struct pxa25x_udc memory = {
.name = "ep5in-int", .name = "ep5in-int",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = INT_FIFO_SIZE, .maxpacket = INT_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = INT_FIFO_SIZE, .fifo_size = INT_FIFO_SIZE,
...@@ -1904,6 +1916,8 @@ static struct pxa25x_udc memory = { ...@@ -1904,6 +1916,8 @@ static struct pxa25x_udc memory = {
.name = "ep6in-bulk", .name = "ep6in-bulk",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = BULK_FIFO_SIZE, .fifo_size = BULK_FIFO_SIZE,
...@@ -1917,6 +1931,8 @@ static struct pxa25x_udc memory = { ...@@ -1917,6 +1931,8 @@ static struct pxa25x_udc memory = {
.name = "ep7out-bulk", .name = "ep7out-bulk",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
USB_EP_CAPS_DIR_OUT),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = BULK_FIFO_SIZE, .fifo_size = BULK_FIFO_SIZE,
...@@ -1931,6 +1947,8 @@ static struct pxa25x_udc memory = { ...@@ -1931,6 +1947,8 @@ static struct pxa25x_udc memory = {
.name = "ep8in-iso", .name = "ep8in-iso",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = ISO_FIFO_SIZE, .fifo_size = ISO_FIFO_SIZE,
...@@ -1944,6 +1962,8 @@ static struct pxa25x_udc memory = { ...@@ -1944,6 +1962,8 @@ static struct pxa25x_udc memory = {
.name = "ep9out-iso", .name = "ep9out-iso",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
USB_EP_CAPS_DIR_OUT),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = ISO_FIFO_SIZE, .fifo_size = ISO_FIFO_SIZE,
...@@ -1958,6 +1978,8 @@ static struct pxa25x_udc memory = { ...@@ -1958,6 +1978,8 @@ static struct pxa25x_udc memory = {
.name = "ep10in-int", .name = "ep10in-int",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = INT_FIFO_SIZE, .maxpacket = INT_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = INT_FIFO_SIZE, .fifo_size = INT_FIFO_SIZE,
...@@ -1973,6 +1995,8 @@ static struct pxa25x_udc memory = { ...@@ -1973,6 +1995,8 @@ static struct pxa25x_udc memory = {
.name = "ep11in-bulk", .name = "ep11in-bulk",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = BULK_FIFO_SIZE, .fifo_size = BULK_FIFO_SIZE,
...@@ -1986,6 +2010,8 @@ static struct pxa25x_udc memory = { ...@@ -1986,6 +2010,8 @@ static struct pxa25x_udc memory = {
.name = "ep12out-bulk", .name = "ep12out-bulk",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
USB_EP_CAPS_DIR_OUT),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = BULK_FIFO_SIZE, .fifo_size = BULK_FIFO_SIZE,
...@@ -2000,6 +2026,8 @@ static struct pxa25x_udc memory = { ...@@ -2000,6 +2026,8 @@ static struct pxa25x_udc memory = {
.name = "ep13in-iso", .name = "ep13in-iso",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = ISO_FIFO_SIZE, .fifo_size = ISO_FIFO_SIZE,
...@@ -2013,6 +2041,8 @@ static struct pxa25x_udc memory = { ...@@ -2013,6 +2041,8 @@ static struct pxa25x_udc memory = {
.name = "ep14out-iso", .name = "ep14out-iso",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO,
USB_EP_CAPS_DIR_OUT),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = ISO_FIFO_SIZE, .fifo_size = ISO_FIFO_SIZE,
...@@ -2027,6 +2057,8 @@ static struct pxa25x_udc memory = { ...@@ -2027,6 +2057,8 @@ static struct pxa25x_udc memory = {
.name = "ep15in-int", .name = "ep15in-int",
.ops = &pxa25x_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = INT_FIFO_SIZE, .maxpacket = INT_FIFO_SIZE,
.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
USB_EP_CAPS_DIR_IN),
}, },
.dev = &memory, .dev = &memory,
.fifo_size = INT_FIFO_SIZE, .fifo_size = INT_FIFO_SIZE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7