git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
serial
/
cpm_uart
/
cpm_uart_cpm2.c
diff --git
a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index
d256688
..
b422c3a
100644
(file)
--- a/
drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/
drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@
-127,7
+127,7
@@
void scc1_lineif(struct uart_cpm_port *pinfo)
io->iop_pdird |= 0x00000002; /* Tx */
/* Wire BRG1 to SCC1 */
io->iop_pdird |= 0x00000002; /* Tx */
/* Wire BRG1 to SCC1 */
- cpm2_immr->im_cpmux.cmx_scr &=
~
0x00ffffff;
+ cpm2_immr->im_cpmux.cmx_scr &= 0x00ffffff;
cpm2_immr->im_cpmux.cmx_scr |= 0x00000000;
pinfo->brg = 1;
}
cpm2_immr->im_cpmux.cmx_scr |= 0x00000000;
pinfo->brg = 1;
}
@@
-140,7
+140,7
@@
void scc2_lineif(struct uart_cpm_port *pinfo)
io->iop_psorb |= 0x00880000;
io->iop_pdirb &= ~0x00030000;
io->iop_psorb &= ~0x00030000;
io->iop_psorb |= 0x00880000;
io->iop_pdirb &= ~0x00030000;
io->iop_psorb &= ~0x00030000;
- cpm2_immr->im_cpmux.cmx_scr &=
~
0xff00ffff;
+ cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff;
cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
pinfo->brg = 2;
}
cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
pinfo->brg = 2;
}
@@
-153,7
+153,7
@@
void scc3_lineif(struct uart_cpm_port *pinfo)
io->iop_psorb |= 0x00880000;
io->iop_pdirb &= ~0x00030000;
io->iop_psorb &= ~0x00030000;
io->iop_psorb |= 0x00880000;
io->iop_pdirb &= ~0x00030000;
io->iop_psorb &= ~0x00030000;
- cpm2_immr->im_cpmux.cmx_scr &=
~
0xffff00ff;
+ cpm2_immr->im_cpmux.cmx_scr &= 0xffff00ff;
cpm2_immr->im_cpmux.cmx_scr |= 0x00001200;
pinfo->brg = 3;
}
cpm2_immr->im_cpmux.cmx_scr |= 0x00001200;
pinfo->brg = 3;
}
@@
-167,7
+167,7
@@
void scc4_lineif(struct uart_cpm_port *pinfo)
io->iop_pdird &= ~0x00000200; /* Rx */
io->iop_pdird |= 0x00000400; /* Tx */
io->iop_pdird &= ~0x00000200; /* Rx */
io->iop_pdird |= 0x00000400; /* Tx */
- cpm2_immr->im_cpmux.cmx_scr &=
~
0xffffff00;
+ cpm2_immr->im_cpmux.cmx_scr &= 0xffffff00;
cpm2_immr->im_cpmux.cmx_scr |= 0x0000001b;
pinfo->brg = 4;
}
cpm2_immr->im_cpmux.cmx_scr |= 0x0000001b;
pinfo->brg = 4;
}
@@
-182,21
+182,21
@@
int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
{
int dpmemsz, memsz;
u8 *dp_mem;
{
int dpmemsz, memsz;
u8 *dp_mem;
- uint dp_
addr
;
+ uint dp_
offset
;
u8 *mem_addr;
dma_addr_t dma_addr = 0;
pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);
dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);
u8 *mem_addr;
dma_addr_t dma_addr = 0;
pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);
dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);
- dp_
mem = cpm2
_dpalloc(dpmemsz, 8);
- if (
dp_mem == NULL
) {
+ dp_
offset = cpm
_dpalloc(dpmemsz, 8);
+ if (
IS_DPERR(dp_offset)
) {
printk(KERN_ERR
printk(KERN_ERR
- "cpm_uart_cpm
1
.c: could not allocate buffer descriptors\n");
+ "cpm_uart_cpm.c: could not allocate buffer descriptors\n");
return -ENOMEM;
}
return -ENOMEM;
}
- dp_
addr = cpm2_dpram_offset(dp_mem
);
+ dp_
mem = cpm_dpram_addr(dp_offset
);
memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
@@
-207,13
+207,13
@@
int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
GFP_KERNEL);
if (mem_addr == NULL) {
GFP_KERNEL);
if (mem_addr == NULL) {
- cpm
2_dpfree(dp_mem
);
+ cpm
_dpfree(dp_offset
);
printk(KERN_ERR
printk(KERN_ERR
- "cpm_uart_cpm
1
.c: could not allocate coherent memory\n");
+ "cpm_uart_cpm.c: could not allocate coherent memory\n");
return -ENOMEM;
}
return -ENOMEM;
}
- pinfo->dp_addr = dp_
addr
;
+ pinfo->dp_addr = dp_
offset
;
pinfo->mem_addr = mem_addr;
pinfo->dma_addr = dma_addr;
pinfo->mem_addr = mem_addr;
pinfo->dma_addr = dma_addr;
@@
-235,7
+235,7
@@
void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
pinfo->tx_fifosize), pinfo->mem_addr,
pinfo->dma_addr);
pinfo->tx_fifosize), pinfo->mem_addr,
pinfo->dma_addr);
- cpm
2_dpfree(&
pinfo->dp_addr);
+ cpm
_dpfree(
pinfo->dp_addr);
}
/* Setup any dynamic params in the uart desc */
}
/* Setup any dynamic params in the uart desc */