redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: emxx_udc: Update EPn variables name

Browse source 
Update EPn* variables names to EPN* to prevent CamelCase usage

Signed-off-by: Alexis Lothoré <alexis.lothore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexis Lothoré 2017-05-10 19:39:41 +02:00 committed by Greg Kroah-Hartman
parent 1be00f941b
commit 75d9c39376
2 changed files with 157 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
drivers/staging/emxx_udc/emxx_udc.c
View file

@ -200,13 +200,13 @@ static u32 _nbu2ss_get_begin_ram_address(struct nbu2ss_udc *udc)
for (num = 0; num < NUM_ENDPOINTS - 1; num++) { for (num = 0; num < NUM_ENDPOINTS - 1; num++) {
p_ep_regs = &udc->p_regs->EP_REGS[num]; p_ep_regs = &udc->p_regs->EP_REGS[num];
data = _nbu2ss_readl(&p_ep_regs->EP_PCKT_ADRS); data = _nbu2ss_readl(&p_ep_regs->EP_PCKT_ADRS);
buf_type = _nbu2ss_readl(&p_ep_regs->EP_CONTROL) & EPn_BUF_TYPE; buf_type = _nbu2ss_readl(&p_ep_regs->EP_CONTROL) & EPN_BUF_TYPE;
if (buf_type == 0) { if (buf_type == 0) {
/* Single Buffer */ /* Single Buffer */
use_ram_size += (data & EPn_MPKT) / sizeof(u32); use_ram_size += (data & EPN_MPKT) / sizeof(u32);
} else { } else {
/* Double Buffer */ /* Double Buffer */
use_ram_size += ((data & EPn_MPKT) / sizeof(u32)) * 2; use_ram_size += ((data & EPN_MPKT) / sizeof(u32)) * 2;
} }
if ((data >> 16) > last_ram_adr) if ((data >> 16) > last_ram_adr)
@ -245,15 +245,15 @@ static int _nbu2ss_ep_init(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep)
/* Bulk, Interrupt, ISO */ /* Bulk, Interrupt, ISO */
switch (ep->ep_type) { switch (ep->ep_type) {
case USB_ENDPOINT_XFER_BULK: case USB_ENDPOINT_XFER_BULK:
data = EPn_BULK; data = EPN_BULK;
break; break;
case USB_ENDPOINT_XFER_INT: case USB_ENDPOINT_XFER_INT:
data = EPn_BUF_SINGLE | EPn_INTERRUPT; data = EPN_BUF_SINGLE | EPN_INTERRUPT;
break; break;
case USB_ENDPOINT_XFER_ISOC: case USB_ENDPOINT_XFER_ISOC:
data = EPn_ISO; data = EPN_ISO;
break; break;
default: default:
@ -267,24 +267,24 @@ static int _nbu2ss_ep_init(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep)
if (ep->direct == USB_DIR_OUT) { if (ep->direct == USB_DIR_OUT) {
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* OUT */ /* OUT */
data = EPn_EN | EPn_BCLR | EPn_DIR0; data = EPN_EN | EPN_BCLR | EPN_DIR0;
_nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
data = EPn_ONAK | EPn_OSTL_EN | EPn_OSTL; data = EPN_ONAK | EPN_OSTL_EN | EPN_OSTL;
_nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
data = EPn_OUT_EN | EPn_OUT_END_EN; data = EPN_OUT_EN | EPN_OUT_END_EN;
_nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_INT_ENA, data); _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_INT_ENA, data);
} else { } else {
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* IN */ /* IN */
data = EPn_EN | EPn_BCLR | EPn_AUTO; data = EPN_EN | EPN_BCLR | EPN_AUTO;
_nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
data = EPn_ISTL; data = EPN_ISTL;
_nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
data = EPn_IN_EN | EPn_IN_END_EN; data = EPN_IN_EN | EPN_IN_END_EN;
_nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_INT_ENA, data); _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_INT_ENA, data);
} }
@ -315,24 +315,24 @@ static int _nbu2ss_epn_exit(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep)
if (ep->direct == USB_DIR_OUT) { if (ep->direct == USB_DIR_OUT) {
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* OUT */ /* OUT */
data = EPn_ONAK | EPn_BCLR; data = EPN_ONAK | EPN_BCLR;
_nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
data = EPn_EN | EPn_DIR0; data = EPN_EN | EPN_DIR0;
_nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
data = EPn_OUT_EN | EPn_OUT_END_EN; data = EPN_OUT_EN | EPN_OUT_END_EN;
_nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_INT_ENA, data); _nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_INT_ENA, data);
} else { } else {
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* IN */ /* IN */
data = EPn_BCLR; data = EPN_BCLR;
_nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
data = EPn_EN | EPn_AUTO; data = EPN_EN | EPN_AUTO;
_nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
data = EPn_IN_EN | EPn_IN_END_EN; data = EPN_IN_EN | EPN_IN_END_EN;
_nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_INT_ENA, data); _nbu2ss_bitclr(&udc->p_regs->EP_REGS[num].EP_INT_ENA, data);
} }
@ -360,21 +360,21 @@ static void _nbu2ss_ep_dma_init(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep)
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* Transfer Direct */ /* Transfer Direct */
data = DCR1_EPn_DIR0; data = DCR1_EPN_DIR0;
_nbu2ss_bitset(&udc->p_regs->EP_DCR[num].EP_DCR1, data); _nbu2ss_bitset(&udc->p_regs->EP_DCR[num].EP_DCR1, data);
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* DMA Mode etc. */ /* DMA Mode etc. */
data = EPn_STOP_MODE | EPn_STOP_SET | EPn_DMAMODE0; data = EPN_STOP_MODE | EPN_STOP_SET | EPN_DMAMODE0;
_nbu2ss_writel(&udc->p_regs->EP_REGS[num].EP_DMA_CTRL, data); _nbu2ss_writel(&udc->p_regs->EP_REGS[num].EP_DMA_CTRL, data);
} else { } else {
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* IN */ /* IN */
_nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, EPn_AUTO); _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, EPN_AUTO);
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* DMA Mode etc. */ /* DMA Mode etc. */
data = EPn_BURST_SET | EPn_DMAMODE0; data = EPN_BURST_SET | EPN_DMAMODE0;
_nbu2ss_writel(&udc->p_regs->EP_REGS[num].EP_DMA_CTRL, data); _nbu2ss_writel(&udc->p_regs->EP_REGS[num].EP_DMA_CTRL, data);
} }
} }
@ -402,12 +402,12 @@ static void _nbu2ss_ep_dma_exit(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep)
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* OUT */ /* OUT */
_nbu2ss_writel(&preg->EP_DCR[num].EP_DCR2, 0); _nbu2ss_writel(&preg->EP_DCR[num].EP_DCR2, 0);
_nbu2ss_bitclr(&preg->EP_DCR[num].EP_DCR1, DCR1_EPn_DIR0); _nbu2ss_bitclr(&preg->EP_DCR[num].EP_DCR1, DCR1_EPN_DIR0);
_nbu2ss_writel(&preg->EP_REGS[num].EP_DMA_CTRL, 0); _nbu2ss_writel(&preg->EP_REGS[num].EP_DMA_CTRL, 0);
} else { } else {
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* IN */ /* IN */
_nbu2ss_bitclr(&preg->EP_REGS[num].EP_CONTROL, EPn_AUTO); _nbu2ss_bitclr(&preg->EP_REGS[num].EP_CONTROL, EPN_AUTO);
_nbu2ss_writel(&preg->EP_REGS[num].EP_DMA_CTRL, 0); _nbu2ss_writel(&preg->EP_REGS[num].EP_DMA_CTRL, 0);
} }
} }
@ -418,9 +418,9 @@ static void _nbu2ss_ep_dma_abort(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep)
{ {
struct fc_regs *preg = udc->p_regs; struct fc_regs *preg = udc->p_regs;
_nbu2ss_bitclr(&preg->EP_DCR[ep->epnum - 1].EP_DCR1, DCR1_EPn_REQEN); _nbu2ss_bitclr(&preg->EP_DCR[ep->epnum - 1].EP_DCR1, DCR1_EPN_REQEN);
mdelay(DMA_DISABLE_TIME); /* DCR1_EPn_REQEN Clear */ mdelay(DMA_DISABLE_TIME); /* DCR1_EPN_REQEN Clear */
_nbu2ss_bitclr(&preg->EP_REGS[ep->epnum - 1].EP_DMA_CTRL, EPn_DMA_EN); _nbu2ss_bitclr(&preg->EP_REGS[ep->epnum - 1].EP_DMA_CTRL, EPN_DMA_EN);
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
@ -453,16 +453,16 @@ static void _nbu2ss_ep_in_end(
} else { } else {
num = epnum - 1; num = epnum - 1;
_nbu2ss_bitclr(&preg->EP_REGS[num].EP_CONTROL, EPn_AUTO); _nbu2ss_bitclr(&preg->EP_REGS[num].EP_CONTROL, EPN_AUTO);
/* Writing of 1-4 bytes */ /* Writing of 1-4 bytes */
if (length) if (length)
_nbu2ss_writel(&preg->EP_REGS[num].EP_WRITE, data32); _nbu2ss_writel(&preg->EP_REGS[num].EP_WRITE, data32);
data = (((length) << 5) & EPn_DW) | EPn_DEND; data = (((length) << 5) & EPN_DW) | EPN_DEND;
_nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, data);
_nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, EPn_AUTO); _nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, EPN_AUTO);
} }
} }
@ -835,7 +835,7 @@ static int _nbu2ss_out_dma(
_nbu2ss_writel(&preg->EP_DCR[num].EP_TADR, (u32)pBuffer); _nbu2ss_writel(&preg->EP_DCR[num].EP_TADR, (u32)pBuffer);
/* Number of transfer packets */ /* Number of transfer packets */
mpkt = _nbu2ss_readl(&preg->EP_REGS[num].EP_PCKT_ADRS) & EPn_MPKT; mpkt = _nbu2ss_readl(&preg->EP_REGS[num].EP_PCKT_ADRS) & EPN_MPKT;
dmacnt = length / mpkt; dmacnt = length / mpkt;
lmpkt = (length % mpkt) & ~(u32)0x03; lmpkt = (length % mpkt) & ~(u32)0x03;
@ -851,18 +851,18 @@ static int _nbu2ss_out_dma(
data = mpkt | (lmpkt << 16); data = mpkt | (lmpkt << 16);
_nbu2ss_writel(&preg->EP_DCR[num].EP_DCR2, data); _nbu2ss_writel(&preg->EP_DCR[num].EP_DCR2, data);
data = ((dmacnt & 0xff) << 16) | DCR1_EPn_DIR0 | DCR1_EPn_REQEN; data = ((dmacnt & 0xff) << 16) | DCR1_EPN_DIR0 | DCR1_EPN_REQEN;
_nbu2ss_writel(&preg->EP_DCR[num].EP_DCR1, data); _nbu2ss_writel(&preg->EP_DCR[num].EP_DCR1, data);
if (burst == 0) { if (burst == 0) {
_nbu2ss_writel(&preg->EP_REGS[num].EP_LEN_DCNT, 0); _nbu2ss_writel(&preg->EP_REGS[num].EP_LEN_DCNT, 0);
_nbu2ss_bitclr(&preg->EP_REGS[num].EP_DMA_CTRL, EPn_BURST_SET); _nbu2ss_bitclr(&preg->EP_REGS[num].EP_DMA_CTRL, EPN_BURST_SET);
} else { } else {
_nbu2ss_writel(&preg->EP_REGS[num].EP_LEN_DCNT _nbu2ss_writel(&preg->EP_REGS[num].EP_LEN_DCNT
, (dmacnt << 16)); , (dmacnt << 16));
_nbu2ss_bitset(&preg->EP_REGS[num].EP_DMA_CTRL, EPn_BURST_SET); _nbu2ss_bitset(&preg->EP_REGS[num].EP_DMA_CTRL, EPN_BURST_SET);
} }
_nbu2ss_bitset(&preg->EP_REGS[num].EP_DMA_CTRL, EPn_DMA_EN); _nbu2ss_bitset(&preg->EP_REGS[num].EP_DMA_CTRL, EPN_DMA_EN);
result = length & ~(u32)0x03; result = length & ~(u32)0x03;
req->div_len = result; req->div_len = result;
@ -978,7 +978,7 @@ static int _nbu2ss_epn_out_transfer(
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/* Receive Length */ /* Receive Length */
iRecvLength iRecvLength
= _nbu2ss_readl(&preg->EP_REGS[num].EP_LEN_DCNT) & EPn_LDATA; = _nbu2ss_readl(&preg->EP_REGS[num].EP_LEN_DCNT) & EPN_LDATA;
if (iRecvLength != 0) { if (iRecvLength != 0) {
result = _nbu2ss_epn_out_data(udc, ep, req, iRecvLength); result = _nbu2ss_epn_out_data(udc, ep, req, iRecvLength);
@ -1042,7 +1042,7 @@ static int _nbu2ss_in_dma(
req->dma_flag = TRUE; req->dma_flag = TRUE;
/* MAX Packet Size */ /* MAX Packet Size */
mpkt = _nbu2ss_readl(&preg->EP_REGS[num].EP_PCKT_ADRS) & EPn_MPKT; mpkt = _nbu2ss_readl(&preg->EP_REGS[num].EP_PCKT_ADRS) & EPN_MPKT;
if ((DMA_MAX_COUNT * mpkt) < length) if ((DMA_MAX_COUNT * mpkt) < length)
iWriteLength = DMA_MAX_COUNT * mpkt; iWriteLength = DMA_MAX_COUNT * mpkt;
@ -1074,7 +1074,7 @@ static int _nbu2ss_in_dma(
_nbu2ss_writel(&preg->EP_DCR[num].EP_TADR, (u32)pBuffer); _nbu2ss_writel(&preg->EP_DCR[num].EP_TADR, (u32)pBuffer);
/* Packet and DMA setting */ /* Packet and DMA setting */
data = ((dmacnt & 0xff) << 16) | DCR1_EPn_REQEN; data = ((dmacnt & 0xff) << 16) | DCR1_EPN_REQEN;
_nbu2ss_writel(&preg->EP_DCR[num].EP_DCR1, data); _nbu2ss_writel(&preg->EP_DCR[num].EP_DCR1, data);
/* Packet setting of EPC */ /* Packet setting of EPC */
@ -1082,7 +1082,7 @@ static int _nbu2ss_in_dma(
_nbu2ss_writel(&preg->EP_REGS[num].EP_LEN_DCNT, data); _nbu2ss_writel(&preg->EP_REGS[num].EP_LEN_DCNT, data);
/*DMA setting of EPC */ /*DMA setting of EPC */
_nbu2ss_bitset(&preg->EP_REGS[num].EP_DMA_CTRL, EPn_DMA_EN); _nbu2ss_bitset(&preg->EP_REGS[num].EP_DMA_CTRL, EPN_DMA_EN);
result = iWriteLength & ~(u32)0x3; result = iWriteLength & ~(u32)0x3;
req->div_len = result; req->div_len = result;
@ -1192,11 +1192,11 @@ static int _nbu2ss_epn_in_transfer(
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/* State confirmation of FIFO */ /* State confirmation of FIFO */
if (req->req.actual == 0) { if (req->req.actual == 0) {
if ((status & EPn_IN_EMPTY) == 0) if ((status & EPN_IN_EMPTY) == 0)
return 1; /* Not Empty */ return 1; /* Not Empty */
} else { } else {
if ((status & EPn_IN_FULL) != 0) if ((status & EPN_IN_FULL) != 0)
return 1; /* Not Empty */ return 1; /* Not Empty */
} }
@ -1252,7 +1252,7 @@ static int _nbu2ss_start_transfer(
} }
} else { } else {
/* EPn */ /* EPN */
if (ep->direct == USB_DIR_OUT) { if (ep->direct == USB_DIR_OUT) {
/* OUT */ /* OUT */
if (!bflag) if (!bflag)
@ -1281,7 +1281,7 @@ static void _nbu2ss_restert_transfer(struct nbu2ss_ep *ep)
length = _nbu2ss_readl( length = _nbu2ss_readl(
&ep->udc->p_regs->EP_REGS[ep->epnum - 1].EP_LEN_DCNT); &ep->udc->p_regs->EP_REGS[ep->epnum - 1].EP_LEN_DCNT);
length &= EPn_LDATA; length &= EPN_LDATA;
if (length < ep->ep.maxpacket) if (length < ep->ep.maxpacket)
bflag = TRUE; bflag = TRUE;
} }
@ -1304,9 +1304,9 @@ static void _nbu2ss_endpoint_toggle_reset(
num = (ep_adrs & 0x7F) - 1; num = (ep_adrs & 0x7F) - 1;
if (ep_adrs & USB_DIR_IN) if (ep_adrs & USB_DIR_IN)
data = EPn_IPIDCLR; data = EPN_IPIDCLR;
else else
data = EPn_BCLR | EPn_OPIDCLR; data = EPN_BCLR | EPN_OPIDCLR;
_nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
} }
@ -1341,9 +1341,9 @@ static void _nbu2ss_set_endpoint_stall(
ep->halted = TRUE; ep->halted = TRUE;
if (ep_adrs & USB_DIR_IN) if (ep_adrs & USB_DIR_IN)
data = EPn_BCLR | EPn_ISTL; data = EPN_BCLR | EPN_ISTL;
else else
data = EPn_OSTL_EN | EPn_OSTL; data = EPN_OSTL_EN | EPN_OSTL;
_nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, data); _nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, data);
} else { } else {
@ -1351,13 +1351,13 @@ static void _nbu2ss_set_endpoint_stall(
ep->stalled = FALSE; ep->stalled = FALSE;
if (ep_adrs & USB_DIR_IN) { if (ep_adrs & USB_DIR_IN) {
_nbu2ss_bitclr(&preg->EP_REGS[num].EP_CONTROL _nbu2ss_bitclr(&preg->EP_REGS[num].EP_CONTROL
, EPn_ISTL); , EPN_ISTL);
} else { } else {
data = data =
_nbu2ss_readl(&preg->EP_REGS[num].EP_CONTROL); _nbu2ss_readl(&preg->EP_REGS[num].EP_CONTROL);
data &= ~EPn_OSTL; data &= ~EPN_OSTL;
data |= EPn_OSTL_EN; data |= EPN_OSTL_EN;
_nbu2ss_writel(&preg->EP_REGS[num].EP_CONTROL _nbu2ss_writel(&preg->EP_REGS[num].EP_CONTROL
, data); , data);
@ -1453,13 +1453,13 @@ static int _nbu2ss_get_ep_stall(struct nbu2ss_udc *udc, u8 ep_adrs)
} else { } else {
data = _nbu2ss_readl(&preg->EP_REGS[epnum - 1].EP_CONTROL); data = _nbu2ss_readl(&preg->EP_REGS[epnum - 1].EP_CONTROL);
if ((data & EPn_EN) == 0) if ((data & EPN_EN) == 0)
return -1; return -1;
if (ep_adrs & USB_ENDPOINT_DIR_MASK) if (ep_adrs & USB_ENDPOINT_DIR_MASK)
bit_data = EPn_ISTL; bit_data = EPN_ISTL;
else else
bit_data = EPn_OSTL; bit_data = EPN_OSTL;
} }
if ((data & bit_data) == 0) if ((data & bit_data) == 0)
@ -1548,7 +1548,7 @@ static void _nbu2ss_epn_set_stall(
regdata = _nbu2ss_readl( regdata = _nbu2ss_readl(
&preg->EP_REGS[ep->epnum - 1].EP_STATUS); &preg->EP_REGS[ep->epnum - 1].EP_STATUS);
if ((regdata & EPn_IN_DATA) == 0) if ((regdata & EPN_IN_DATA) == 0)
break; break;
mdelay(1); mdelay(1);
@ -1968,7 +1968,7 @@ static inline void _nbu2ss_epn_in_int(
status = status =
_nbu2ss_readl(&preg->EP_REGS[ep->epnum - 1].EP_STATUS); _nbu2ss_readl(&preg->EP_REGS[ep->epnum - 1].EP_STATUS);
if ((status & EPn_IN_FULL) == 0) { if ((status & EPN_IN_FULL) == 0) {
/*-----------------------------------------*/ /*-----------------------------------------*/
/* 0 Length Packet */ /* 0 Length Packet */
req->zero = false; req->zero = false;
@ -2059,18 +2059,18 @@ static inline void _nbu2ss_epn_out_dma_int(
} }
ep_dmacnt = _nbu2ss_readl(&preg->EP_REGS[num].EP_LEN_DCNT) ep_dmacnt = _nbu2ss_readl(&preg->EP_REGS[num].EP_LEN_DCNT)
& EPn_DMACNT; & EPN_DMACNT;
ep_dmacnt >>= 16; ep_dmacnt >>= 16;
for (i = 0; i < EPC_PLL_LOCK_COUNT; i++) { for (i = 0; i < EPC_PLL_LOCK_COUNT; i++) {
dmacnt = _nbu2ss_readl(&preg->EP_DCR[num].EP_DCR1) dmacnt = _nbu2ss_readl(&preg->EP_DCR[num].EP_DCR1)
& DCR1_EPn_DMACNT; & DCR1_EPN_DMACNT;
dmacnt >>= 16; dmacnt >>= 16;
if (ep_dmacnt == dmacnt) if (ep_dmacnt == dmacnt)
break; break;
} }
_nbu2ss_bitclr(&preg->EP_DCR[num].EP_DCR1, DCR1_EPn_REQEN); _nbu2ss_bitclr(&preg->EP_DCR[num].EP_DCR1, DCR1_EPN_REQEN);
if (dmacnt != 0) { if (dmacnt != 0) {
mpkt = ep->ep.maxpacket; mpkt = ep->ep.maxpacket;
@ -2117,20 +2117,20 @@ static inline void _nbu2ss_epn_int(struct nbu2ss_udc *udc, u32 epnum)
return; return;
} }
if (status & EPn_OUT_END_INT) { if (status & EPN_OUT_END_INT) {
status &= ~EPn_OUT_INT; status &= ~EPN_OUT_INT;
_nbu2ss_epn_out_dma_int(udc, ep, req); _nbu2ss_epn_out_dma_int(udc, ep, req);
} }
if (status & EPn_OUT_INT) if (status & EPN_OUT_INT)
_nbu2ss_epn_out_int(udc, ep, req); _nbu2ss_epn_out_int(udc, ep, req);
if (status & EPn_IN_END_INT) { if (status & EPN_IN_END_INT) {
status &= ~EPn_IN_INT; status &= ~EPN_IN_INT;
_nbu2ss_epn_in_dma_int(udc, ep, req); _nbu2ss_epn_in_dma_int(udc, ep, req);
} }
if (status & EPn_IN_INT) if (status & EPN_IN_INT)
_nbu2ss_epn_in_int(udc, ep, req); _nbu2ss_epn_in_int(udc, ep, req);
} }
@ -2231,9 +2231,9 @@ static void _nbu2ss_fifo_flush(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep)
_nbu2ss_bitset(&p->EP0_CONTROL, EP0_BCLR); _nbu2ss_bitset(&p->EP0_CONTROL, EP0_BCLR);
} else { } else {
/* EPn */ /* EPN */
_nbu2ss_ep_dma_abort(udc, ep); _nbu2ss_ep_dma_abort(udc, ep);
_nbu2ss_bitset(&p->EP_REGS[ep->epnum - 1].EP_CONTROL, EPn_BCLR); _nbu2ss_bitset(&p->EP_REGS[ep->epnum - 1].EP_CONTROL, EPN_BCLR);
} }
} }
@ -2478,7 +2478,7 @@ static irqreturn_t _nbu2ss_udc_irq(int irq, void *_udc)
suspend_flag = 1; suspend_flag = 1;
} }
if (status & EPn_INT) { if (status & EPN_INT) {
/* EP INT */ /* EP INT */
int_bit = status >> 8; int_bit = status >> 8;
@ -2868,7 +2868,7 @@ static int nbu2ss_ep_fifo_status(struct usb_ep *_ep)
} else { } else {
data = _nbu2ss_readl(&preg->EP_REGS[ep->epnum - 1].EP_LEN_DCNT) data = _nbu2ss_readl(&preg->EP_REGS[ep->epnum - 1].EP_LEN_DCNT)
& EPn_LDATA; & EPN_LDATA;
} }
spin_unlock_irqrestore(&udc->lock, flags); spin_unlock_irqrestore(&udc->lock, flags);

178
drivers/staging/emxx_udc/emxx_udc.h
View file

@ -144,7 +144,7 @@
/*------- (0x001C) Setup Data 1 Register */ /*------- (0x001C) Setup Data 1 Register */
/*------- (0x0020) USB Interrupt Status Register */ /*------- (0x0020) USB Interrupt Status Register */
#define EPn_INT 0x00FFFF00 #define EPN_INT 0x00FFFF00
#define EP15_INT BIT23 #define EP15_INT BIT23
#define EP14_INT BIT22 #define EP14_INT BIT22
#define EP13_INT BIT21 #define EP13_INT BIT21
@ -264,102 +264,102 @@
/*------- (0x0038) EP0 Read Register */ /*------- (0x0038) EP0 Read Register */
/*------- (0x003C) EP0 Write Register */ /*------- (0x003C) EP0 Write Register */
/*------- (0x0040:) EPn Control Register */ /*------- (0x0040:) EPN Control Register */
#define EPn_EN BIT31 #define EPN_EN BIT31
#define EPn_BUF_TYPE BIT30 #define EPN_BUF_TYPE BIT30
#define EPn_BUF_SINGLE BIT30 #define EPN_BUF_SINGLE BIT30
#define EPn_DIR0 BIT26 #define EPN_DIR0 BIT26
#define EPn_MODE (BIT25 + BIT24) #define EPN_MODE (BIT25 + BIT24)
#define EPn_BULK 0 #define EPN_BULK 0
#define EPn_INTERRUPT BIT24 #define EPN_INTERRUPT BIT24
#define EPn_ISO BIT25 #define EPN_ISO BIT25
#define EPn_OVERSEL BIT17 #define EPN_OVERSEL BIT17
#define EPn_AUTO BIT16 #define EPN_AUTO BIT16
#define EPn_IPIDCLR BIT11 #define EPN_IPIDCLR BIT11
#define EPn_OPIDCLR BIT10 #define EPN_OPIDCLR BIT10
#define EPn_BCLR BIT09 #define EPN_BCLR BIT09
#define EPn_CBCLR BIT08 #define EPN_CBCLR BIT08
#define EPn_DEND BIT07 #define EPN_DEND BIT07
#define EPn_DW (BIT06 + BIT05) #define EPN_DW (BIT06 + BIT05)
#define EPn_DW4 0 #define EPN_DW4 0
#define EPn_DW3 (BIT06 + BIT05) #define EPN_DW3 (BIT06 + BIT05)
#define EPn_DW2 BIT06 #define EPN_DW2 BIT06
#define EPn_DW1 BIT05 #define EPN_DW1 BIT05
#define EPn_OSTL_EN BIT04 #define EPN_OSTL_EN BIT04
#define EPn_ISTL BIT03 #define EPN_ISTL BIT03
#define EPn_OSTL BIT02 #define EPN_OSTL BIT02
#define EPn_ONAK BIT00 #define EPN_ONAK BIT00
/*------- (0x0044:) EPn Status Register */ /*------- (0x0044:) EPN Status Register */
#define EPn_ISO_PIDERR BIT29 /* R */ #define EPN_ISO_PIDERR BIT29 /* R */
#define EPn_OPID BIT28 /* R */ #define EPN_OPID BIT28 /* R */
#define EPn_OUT_NOTKN BIT27 /* R */ #define EPN_OUT_NOTKN BIT27 /* R */
#define EPn_ISO_OR BIT26 /* R */ #define EPN_ISO_OR BIT26 /* R */
#define EPn_ISO_CRC BIT24 /* R */ #define EPN_ISO_CRC BIT24 /* R */
#define EPn_OUT_END_INT BIT23 /* RW */ #define EPN_OUT_END_INT BIT23 /* RW */
#define EPn_OUT_OR_INT BIT22 /* RW */ #define EPN_OUT_OR_INT BIT22 /* RW */
#define EPn_OUT_NAK_ERR_INT BIT21 /* RW */ #define EPN_OUT_NAK_ERR_INT BIT21 /* RW */
#define EPn_OUT_STALL_INT BIT20 /* RW */ #define EPN_OUT_STALL_INT BIT20 /* RW */
#define EPn_OUT_INT BIT19 /* RW */ #define EPN_OUT_INT BIT19 /* RW */
#define EPn_OUT_NULL_INT BIT18 /* RW */ #define EPN_OUT_NULL_INT BIT18 /* RW */
#define EPn_OUT_FULL BIT17 /* R */ #define EPN_OUT_FULL BIT17 /* R */
#define EPn_OUT_EMPTY BIT16 /* R */ #define EPN_OUT_EMPTY BIT16 /* R */
#define EPn_IPID BIT10 /* R */ #define EPN_IPID BIT10 /* R */
#define EPn_IN_NOTKN BIT09 /* R */ #define EPN_IN_NOTKN BIT09 /* R */
#define EPn_ISO_UR BIT08 /* R */ #define EPN_ISO_UR BIT08 /* R */
#define EPn_IN_END_INT BIT07 /* RW */ #define EPN_IN_END_INT BIT07 /* RW */
#define EPn_IN_NAK_ERR_INT BIT05 /* RW */ #define EPN_IN_NAK_ERR_INT BIT05 /* RW */
#define EPn_IN_STALL_INT BIT04 /* RW */ #define EPN_IN_STALL_INT BIT04 /* RW */
#define EPn_IN_INT BIT03 /* RW */ #define EPN_IN_INT BIT03 /* RW */
#define EPn_IN_DATA BIT02 /* R */ #define EPN_IN_DATA BIT02 /* R */
#define EPn_IN_FULL BIT01 /* R */ #define EPN_IN_FULL BIT01 /* R */
#define EPn_IN_EMPTY BIT00 /* R */ #define EPN_IN_EMPTY BIT00 /* R */
#define EPn_INT_EN \ #define EPN_INT_EN \
(EPn_OUT_END_INT | EPn_OUT_INT | EPn_IN_END_INT | EPn_IN_INT) (EPN_OUT_END_INT | EPN_OUT_INT | EPN_IN_END_INT | EPN_IN_INT)
/*------- (0x0048:) EPn Interrupt Enable Register */ /*------- (0x0048:) EPN Interrupt Enable Register */
#define EPn_OUT_END_EN BIT23 /* RW */ #define EPN_OUT_END_EN BIT23 /* RW */
#define EPn_OUT_OR_EN BIT22 /* RW */ #define EPN_OUT_OR_EN BIT22 /* RW */
#define EPn_OUT_NAK_ERR_EN BIT21 /* RW */ #define EPN_OUT_NAK_ERR_EN BIT21 /* RW */
#define EPn_OUT_STALL_EN BIT20 /* RW */ #define EPN_OUT_STALL_EN BIT20 /* RW */
#define EPn_OUT_EN BIT19 /* RW */ #define EPN_OUT_EN BIT19 /* RW */
#define EPn_OUT_NULL_EN BIT18 /* RW */ #define EPN_OUT_NULL_EN BIT18 /* RW */
#define EPn_IN_END_EN BIT07 /* RW */ #define EPN_IN_END_EN BIT07 /* RW */
#define EPn_IN_NAK_ERR_EN BIT05 /* RW */ #define EPN_IN_NAK_ERR_EN BIT05 /* RW */
#define EPn_IN_STALL_EN BIT04 /* RW */ #define EPN_IN_STALL_EN BIT04 /* RW */
#define EPn_IN_EN BIT03 /* RW */ #define EPN_IN_EN BIT03 /* RW */
/*------- (0x004C:) EPn Interrupt Enable Register */ /*------- (0x004C:) EPN Interrupt Enable Register */
#define EPn_STOP_MODE BIT11 #define EPN_STOP_MODE BIT11
#define EPn_DEND_SET BIT10 #define EPN_DEND_SET BIT10
#define EPn_BURST_SET BIT09 #define EPN_BURST_SET BIT09
#define EPn_STOP_SET BIT08 #define EPN_STOP_SET BIT08
#define EPn_DMA_EN BIT04 #define EPN_DMA_EN BIT04
#define EPn_DMAMODE0 BIT00 #define EPN_DMAMODE0 BIT00
/*------- (0x0050:) EPn MaxPacket & BaseAddress Register */ /*------- (0x0050:) EPN MaxPacket & BaseAddress Register */
#define EPn_BASEAD 0x1FFF0000 #define EPN_BASEAD 0x1FFF0000
#define EPn_MPKT 0x000007FF #define EPN_MPKT 0x000007FF
/*------- (0x0054:) EPn Length & DMA Count Register */ /*------- (0x0054:) EPN Length & DMA Count Register */
#define EPn_DMACNT 0x01FF0000 #define EPN_DMACNT 0x01FF0000
#define EPn_LDATA 0x000007FF #define EPN_LDATA 0x000007FF
/*------- (0x0058:) EPn Read Register */ /*------- (0x0058:) EPN Read Register */
/*------- (0x005C:) EPn Write Register */ /*------- (0x005C:) EPN Write Register */
/*------- (0x1000) AHBSCTR Register */ /*------- (0x1000) AHBSCTR Register */
#define WAIT_MODE BIT00 #define WAIT_MODE BIT00
@ -428,19 +428,19 @@
#define EP_AVAILABLE 0xFFFF0000 /* R */ #define EP_AVAILABLE 0xFFFF0000 /* R */
#define DMA_AVAILABLE 0x0000FFFF /* R */ #define DMA_AVAILABLE 0x0000FFFF /* R */
/*------- (0x1110:) EPnDCR1 Register */ /*------- (0x1110:) EPNDCR1 Register */
#define DCR1_EPn_DMACNT 0x00FF0000 /* RW */ #define DCR1_EPN_DMACNT 0x00FF0000 /* RW */
#define DCR1_EPn_DIR0 BIT01 /* RW */ #define DCR1_EPN_DIR0 BIT01 /* RW */
#define DCR1_EPn_REQEN BIT00 /* RW */ #define DCR1_EPN_REQEN BIT00 /* RW */
/*------- (0x1114:) EPnDCR2 Register */ /*------- (0x1114:) EPNDCR2 Register */
#define DCR2_EPn_LMPKT 0x07FF0000 /* RW */ #define DCR2_EPN_LMPKT 0x07FF0000 /* RW */
#define DCR2_EPn_MPKT 0x000007FF /* RW */ #define DCR2_EPN_MPKT 0x000007FF /* RW */
/*------- (0x1118:) EPnTADR Register */ /*------- (0x1118:) EPNTADR Register */
#define EPn_TADR 0xFFFFFFFF /* RW */ #define EPN_TADR 0xFFFFFFFF /* RW */
/*===========================================================================*/ /*===========================================================================*/
/* Struct */ /* Struct */
@ -509,10 +509,10 @@ struct fc_regs {
#define EP0_PACKETSIZE 64 #define EP0_PACKETSIZE 64
#define EP_PACKETSIZE 1024 #define EP_PACKETSIZE 1024
/* EPn RAM SIZE */ /* EPN RAM SIZE */
#define D_RAM_SIZE_CTRL 64 #define D_RAM_SIZE_CTRL 64
/* EPn Bulk Endpoint Max Packet Size */ /* EPN Bulk Endpoint Max Packet Size */
#define D_FS_RAM_SIZE_BULK 64 #define D_FS_RAM_SIZE_BULK 64
#define D_HS_RAM_SIZE_BULK 512 #define D_HS_RAM_SIZE_BULK 512