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: move global struct usba_ep usba_ep to struct usba_udc 

so we can have multiple usb gadget instance

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:36:23 +08:00
parent b3f442b0ee
commit 68522de70e
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@
static struct usba_udc the_udc; static struct usba_udc the_udc;
static struct usba_ep *usba_ep;
#ifdef CONFIG_USB_GADGET_DEBUG_FS #ifdef CONFIG_USB_GADGET_DEBUG_FS
#include <linux/debugfs.h> #include <linux/debugfs.h>
@ -1147,7 +1146,7 @@ static int do_test_mode(struct usba_udc *udc)
* Test_SE0_NAK: Force high-speed mode and set up ep0 * Test_SE0_NAK: Force high-speed mode and set up ep0
* for Bulk IN transfers * for Bulk IN transfers
*/ */
ep = &usba_ep[0]; ep = &udc->usba_ep[0];
usba_writel(udc, TST, usba_writel(udc, TST,
USBA_BF(SPEED_CFG, USBA_SPEED_CFG_FORCE_HIGH)); USBA_BF(SPEED_CFG, USBA_SPEED_CFG_FORCE_HIGH));
usba_ep_writel(ep, CFG, usba_ep_writel(ep, CFG,
@ -1165,7 +1164,7 @@ static int do_test_mode(struct usba_udc *udc)
break; break;
case 0x0400: case 0x0400:
/* Test_Packet */ /* Test_Packet */
ep = &usba_ep[0]; ep = &udc->usba_ep[0];
usba_ep_writel(ep, CFG, usba_ep_writel(ep, CFG,
USBA_BF(EPT_SIZE, USBA_EPT_SIZE_64) USBA_BF(EPT_SIZE, USBA_EPT_SIZE_64)
| USBA_EPT_DIR_IN | USBA_EPT_DIR_IN
@ -1668,7 +1667,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
for (i = 1; i < USBA_NR_ENDPOINTS; i++) for (i = 1; i < USBA_NR_ENDPOINTS; i++)
if (dma_status & (1 << i)) if (dma_status & (1 << i))
usba_dma_irq(udc, &usba_ep[i]); usba_dma_irq(udc, &udc->usba_ep[i]);
} }
ep_status = USBA_BFEXT(EPT_INT, status); ep_status = USBA_BFEXT(EPT_INT, status);
@ -1677,10 +1676,10 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
for (i = 0; i < USBA_NR_ENDPOINTS; i++) for (i = 0; i < USBA_NR_ENDPOINTS; i++)
if (ep_status & (1 << i)) { if (ep_status & (1 << i)) {
if (ep_is_control(&usba_ep[i])) if (ep_is_control(&udc->usba_ep[i]))
usba_control_irq(udc, &usba_ep[i]); usba_control_irq(udc, &udc->usba_ep[i]);
else else
usba_ep_irq(udc, &usba_ep[i]); usba_ep_irq(udc, &udc->usba_ep[i]);
} }
} }
@ -1705,7 +1704,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
DBG(DBG_BUS, "%s bus reset detected\n", DBG(DBG_BUS, "%s bus reset detected\n",
usb_speed_string(udc->gadget.speed)); usb_speed_string(udc->gadget.speed));
ep0 = &usba_ep[0]; ep0 = &udc->usba_ep[0];
ep0->ep.desc = &usba_ep0_desc; ep0->ep.desc = &usba_ep0_desc;
ep0->state = WAIT_FOR_SETUP; ep0->state = WAIT_FOR_SETUP;
usba_ep_writel(ep0, CFG, usba_ep_writel(ep0, CFG,
@ -1841,6 +1840,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
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 = &the_udc;
static struct usba_ep *usba_ep;
int irq, ret, i; int irq, ret, i;
regs = platform_get_resource(pdev, IORESOURCE_MEM, CTRL_IOMEM_ID); regs = platform_get_resource(pdev, IORESOURCE_MEM, CTRL_IOMEM_ID);
@ -1896,6 +1896,8 @@ static int __init usba_udc_probe(struct platform_device *pdev)
if (!usba_ep) if (!usba_ep)
goto err_alloc_ep; goto err_alloc_ep;
udc->usba_ep = usba_ep;
the_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);
@ -2008,7 +2010,7 @@ static int __exit usba_udc_remove(struct platform_device *pdev)
usb_del_gadget_udc(&udc->gadget); usb_del_gadget_udc(&udc->gadget);
for (i = 1; i < pdata->num_ep; i++) for (i = 1; i < pdata->num_ep; i++)
usba_ep_cleanup_debugfs(&usba_ep[i]); usba_ep_cleanup_debugfs(&udc->usba_ep[i]);
usba_cleanup_debugfs(udc); usba_cleanup_debugfs(udc);
if (gpio_is_valid(udc->vbus_pin)) { if (gpio_is_valid(udc->vbus_pin)) {

1
drivers/usb/gadget/atmel_usba_udc.h
View File

@ -319,6 +319,7 @@ struct usba_udc {
int vbus_pin_inverted; int vbus_pin_inverted;
struct clk *pclk; struct clk *pclk;
struct clk *hclk; struct clk *hclk;
struct usba_ep *usba_ep;
u16 devstatus; u16 devstatus;