Commit 702da6b4 authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP: Manually merged drivers/net/smc91x.h

Manually merged drivers/net/smc91x.h
parent d8889ed3
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
/* We actually can't write halfwords properly if not word aligned */ /* We actually can't write halfwords properly if not word aligned */
static inline void static inline void
SMC_outw(u16 val, unsigned long ioaddr, int reg) SMC_outw(u16 val, void __iomem *ioaddr, int reg)
{ {
if (reg & 2) { if (reg & 2) {
unsigned int v = val << 16; unsigned int v = val << 16;
...@@ -330,7 +330,7 @@ static inline void SMC_outsw (unsigned long a, int r, unsigned char* p, int l) ...@@ -330,7 +330,7 @@ static inline void SMC_outsw (unsigned long a, int r, unsigned char* p, int l)
#define SMC_insl(a, r, p, l) \ #define SMC_insl(a, r, p, l) \
smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l) smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l)
static inline void static inline void
smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma, smc_pxa_dma_insl(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
u_char *buf, int len) u_char *buf, int len)
{ {
dma_addr_t dmabuf; dma_addr_t dmabuf;
...@@ -368,7 +368,7 @@ smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma, ...@@ -368,7 +368,7 @@ smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma,
#define SMC_insw(a, r, p, l) \ #define SMC_insw(a, r, p, l) \
smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l) smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l)
static inline void static inline void
smc_pxa_dma_insw(u_long ioaddr, u_long physaddr, int reg, int dma, smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
u_char *buf, int len) u_char *buf, int len)
{ {
dma_addr_t dmabuf; dma_addr_t dmabuf;
...@@ -693,14 +693,6 @@ static const char * chip_ids[ 16 ] = { ...@@ -693,14 +693,6 @@ static const char * chip_ids[ 16 ] = {
NULL, NULL, NULL}; NULL, NULL, NULL};
/*
. Transmit status bits
*/
#define TS_SUCCESS 0x0001
#define TS_LOSTCAR 0x0400
#define TS_LATCOL 0x0200
#define TS_16COL 0x0010
/* /*
. Receive status bits . Receive status bits
*/ */
...@@ -858,6 +850,7 @@ static const char * chip_ids[ 16 ] = { ...@@ -858,6 +850,7 @@ static const char * chip_ids[ 16 ] = {
#define SMC_GET_FIFO() SMC_inw( ioaddr, FIFO_REG ) #define SMC_GET_FIFO() SMC_inw( ioaddr, FIFO_REG )
#define SMC_GET_PTR() SMC_inw( ioaddr, PTR_REG ) #define SMC_GET_PTR() SMC_inw( ioaddr, PTR_REG )
#define SMC_SET_PTR(x) SMC_outw( x, ioaddr, PTR_REG ) #define SMC_SET_PTR(x) SMC_outw( x, ioaddr, PTR_REG )
#define SMC_GET_EPH_STATUS() SMC_inw( ioaddr, EPH_STATUS_REG )
#define SMC_GET_RCR() SMC_inw( ioaddr, RCR_REG ) #define SMC_GET_RCR() SMC_inw( ioaddr, RCR_REG )
#define SMC_SET_RCR(x) SMC_outw( x, ioaddr, RCR_REG ) #define SMC_SET_RCR(x) SMC_outw( x, ioaddr, RCR_REG )
#define SMC_GET_REV() SMC_inw( ioaddr, REV_REG ) #define SMC_GET_REV() SMC_inw( ioaddr, REV_REG )
......
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