Commit a61fc1e9 authored by Mike Frysinger's avatar Mike Frysinger Committed by David S. Miller
Browse files

netdev/smc91x: unify Blackfin code a bit and use proper read/write functions 



Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d3e35aa

drivers/net/smc91x.h

+12 −33
Original line number Diff line number Diff line
@@ -87,49 +87,28 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) 
#define RPC_LSA_DEFAULT		RPC_LED_100_10

#define RPC_LSB_DEFAULT		RPC_LED_TX_RX



# if defined (CONFIG_BFIN561_EZKIT)

#define SMC_CAN_USE_8BIT	0

#define SMC_CAN_USE_16BIT	1

# if defined(CONFIG_BF561)

#define SMC_CAN_USE_32BIT	1

#define SMC_IO_SHIFT		0

#define SMC_NOWAIT      	1

#define SMC_USE_BFIN_DMA	0





#define SMC_inw(a, r)       	readw((a) + (r))

#define SMC_outw(v, a, r)   	writew(v, (a) + (r))

#define SMC_inl(a, r)       	readl((a) + (r))

#define SMC_outl(v, a, r)   	writel(v, (a) + (r))

#define SMC_outsl(a, r, p, l)	outsl((unsigned long *)((a) + (r)), p, l)

#define SMC_insl(a, r, p, l) 	insl ((unsigned long *)((a) + (r)), p, l)

# else

#define SMC_CAN_USE_8BIT	0

#define SMC_CAN_USE_16BIT	1

#define SMC_CAN_USE_32BIT	0

# endif

#define SMC_IO_SHIFT		0

#define SMC_NOWAIT      	1

#define SMC_USE_BFIN_DMA	0





#define SMC_inw(a, r)		readw((a) + (r))

#define SMC_outw(v, a, r)	writew(v, (a) + (r))

#define SMC_outsw(a, r, p, l)	outsw((unsigned long *)((a) + (r)), p, l)

#define SMC_insw(a, r, p, l) 	insw ((unsigned long *)((a) + (r)), p, l)

#define SMC_insw(a, r, p, l)	readsw((a) + (r), p, l)

#define SMC_outsw(a, r, p, l)	writesw((a) + (r), p, l)

# if SMC_CAN_USE_32BIT

#define SMC_inl(a, r)		readl((a) + (r))

#define SMC_outl(v, a, r)	writel(v, (a) + (r))

#define SMC_insl(a, r, p, l)	readsl((a) + (r), p, l)

#define SMC_outsl(a, r, p, l)	writesl((a) + (r), p, l)

# endif

/* check if the mac in reg is valid */

#define SMC_GET_MAC_ADDR(lp, addr)				\

	do {							\

		unsigned int __v;				\

		__v = SMC_inw(ioaddr, ADDR0_REG(lp));		\

		addr[0] = __v; addr[1] = __v >> 8;		\

		__v = SMC_inw(ioaddr, ADDR1_REG(lp));		\

		addr[2] = __v; addr[3] = __v >> 8;		\

		__v = SMC_inw(ioaddr, ADDR2_REG(lp));		\

		addr[4] = __v; addr[5] = __v >> 8;		\

		if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) {		\

			random_ether_addr(addr);		\

		}						\

	} while (0)



#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6)



/* We can only do 16-bit reads and writes in the static memory space. */