hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: gadget: atmel_usba: allow multi instance 

drop static struct usba_udc the_udc

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: Bo Shen <voice.shen@atmel.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2013-05-20 22:46:02 +08:00
parent 68522de70e
commit e8f2ea3932
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/gadget/atmel_usba_udc.c
View File

@ -27,9 +27,6 @@
#include "atmel_usba_udc.h" #include "atmel_usba_udc.h"
static struct usba_udc the_udc;
#ifdef CONFIG_USB_GADGET_DEBUG_FS #ifdef CONFIG_USB_GADGET_DEBUG_FS
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
@ -1013,17 +1010,14 @@ static void nop_release(struct device *dev)
} }
static struct usba_udc the_udc = { struct usb_gadget usba_gadget_template = {
.gadget = {
.ops = &usba_udc_ops, .ops = &usba_udc_ops,
.ep_list = LIST_HEAD_INIT(the_udc.gadget.ep_list),
.max_speed = USB_SPEED_HIGH, .max_speed = USB_SPEED_HIGH,
.name = "atmel_usba_udc", .name = "atmel_usba_udc",
.dev = { .dev = {
.init_name = "gadget", .init_name = "gadget",
.release = nop_release, .release = nop_release,
}, },
},
}; };
/* /*
@ -1839,10 +1833,17 @@ static int __init usba_udc_probe(struct platform_device *pdev)
struct usba_platform_data *pdata = pdev->dev.platform_data; struct usba_platform_data *pdata = pdev->dev.platform_data;
struct resource *regs, *fifo; struct resource *regs, *fifo;
struct clk *pclk, *hclk; struct clk *pclk, *hclk;
struct usba_udc *udc = &the_udc; struct usba_udc *udc;
static struct usba_ep *usba_ep; static struct usba_ep *usba_ep;
int irq, ret, i; int irq, ret, i;
udc = devm_kzalloc(&pdev->dev, sizeof(*udc), GFP_KERNEL);
if (!udc)
return -ENOMEM;
udc->gadget = usba_gadget_template;
INIT_LIST_HEAD(&udc->gadget.ep_list);
regs = platform_get_resource(pdev, IORESOURCE_MEM, CTRL_IOMEM_ID); regs = platform_get_resource(pdev, IORESOURCE_MEM, CTRL_IOMEM_ID);
fifo = platform_get_resource(pdev, IORESOURCE_MEM, FIFO_IOMEM_ID); fifo = platform_get_resource(pdev, IORESOURCE_MEM, FIFO_IOMEM_ID);
if (!regs || !fifo || !pdata) if (!regs || !fifo || !pdata)
@ -1897,8 +1898,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
goto err_alloc_ep; goto err_alloc_ep;
udc->usba_ep = usba_ep; udc->usba_ep = usba_ep;
udc->gadget.ep0 = &usba_ep[0].ep;
the_udc.gadget.ep0 = &usba_ep[0].ep;
INIT_LIST_HEAD(&usba_ep[0].ep.ep_list); INIT_LIST_HEAD(&usba_ep[0].ep.ep_list);
usba_ep[0].ep_regs = udc->regs + USBA_EPT_BASE(0); usba_ep[0].ep_regs = udc->regs + USBA_EPT_BASE(0);
@ -1907,7 +1907,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
usba_ep[0].ep.ops = &usba_ep_ops; usba_ep[0].ep.ops = &usba_ep_ops;
usba_ep[0].ep.name = pdata->ep[0].name; usba_ep[0].ep.name = pdata->ep[0].name;
usba_ep[0].ep.maxpacket = pdata->ep[0].fifo_size; usba_ep[0].ep.maxpacket = pdata->ep[0].fifo_size;
usba_ep[0].udc = &the_udc; usba_ep[0].udc = udc;
INIT_LIST_HEAD(&usba_ep[0].queue); INIT_LIST_HEAD(&usba_ep[0].queue);
usba_ep[0].fifo_size = pdata->ep[0].fifo_size; usba_ep[0].fifo_size = pdata->ep[0].fifo_size;
usba_ep[0].nr_banks = pdata->ep[0].nr_banks; usba_ep[0].nr_banks = pdata->ep[0].nr_banks;
@ -1924,7 +1924,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
ep->ep.ops = &usba_ep_ops; ep->ep.ops = &usba_ep_ops;
ep->ep.name = pdata->ep[i].name; ep->ep.name = pdata->ep[i].name;
ep->ep.maxpacket = pdata->ep[i].fifo_size; ep->ep.maxpacket = pdata->ep[i].fifo_size;
ep->udc = &the_udc; ep->udc = udc;
INIT_LIST_HEAD(&ep->queue); INIT_LIST_HEAD(&ep->queue);
ep->fifo_size = pdata->ep[i].fifo_size; ep->fifo_size = pdata->ep[i].fifo_size;
ep->nr_banks = pdata->ep[i].nr_banks; ep->nr_banks = pdata->ep[i].nr_banks;