diff options
| author | Bo Shen <voice.shen@atmel.com> | 2013-04-24 15:59:28 +0800 | 
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2013-06-24 19:11:16 -0500 | 
| commit | d256be29f86b7c4e98435f7047a3e9c44dd7e0f4 (patch) | |
| tree | d30d9fc9d293743ca7b543072ee018213d6e4ad5 /drivers/net/macb.h | |
| parent | b1a0006eba76ad72ba2cbaefc948dc7b511e8d2d (diff) | |
| download | olio-uboot-2014.01-d256be29f86b7c4e98435f7047a3e9c44dd7e0f4.tar.xz olio-uboot-2014.01-d256be29f86b7c4e98435f7047a3e9c44dd7e0f4.zip | |
net: macb: add support for gigabit MAC
Add gigabit MAC support in macb driver
  - using IP version to distinguish whether MAC is GMAC
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Diffstat (limited to 'drivers/net/macb.h')
| -rw-r--r-- | drivers/net/macb.h | 55 | 
1 files changed, 49 insertions, 6 deletions
| diff --git a/drivers/net/macb.h b/drivers/net/macb.h index f92a20c70..68eef00c0 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h @@ -26,6 +26,7 @@  #define MACB_NCR				0x0000  #define MACB_NCFGR				0x0004  #define MACB_NSR				0x0008 +#define GEM_UR					0x000c  #define MACB_TSR				0x0014  #define MACB_RBQP				0x0018  #define MACB_TBQP				0x001c @@ -71,6 +72,7 @@  #define MACB_TPQ				0x00bc  #define MACB_USRIO				0x00c0  #define MACB_WOL				0x00c4 +#define MACB_MID				0x00fc  /* Bitfields in NCR */  #define MACB_LB_OFFSET				0 @@ -138,6 +140,13 @@  #define MACB_IRXFCS_OFFSET			19  #define MACB_IRXFCS_SIZE			1 +#define GEM_GBE_OFFSET				10 +#define GEM_GBE_SIZE				1 +#define GEM_CLK_OFFSET				18 +#define GEM_CLK_SIZE				3 +#define GEM_DBW_OFFSET				21 +#define GEM_DBW_SIZE				2 +  /* Bitfields in NSR */  #define MACB_NSR_LINK_OFFSET			0  #define MACB_NSR_LINK_SIZE			1 @@ -146,6 +155,10 @@  #define MACB_IDLE_OFFSET			2  #define MACB_IDLE_SIZE				1 +/* Bitfields in UR */ +#define GEM_RGMII_OFFSET			0 +#define GEM_RGMII_SIZE				1 +  /* Bitfields in TSR */  #define MACB_UBR_OFFSET				0  #define MACB_UBR_SIZE				1 @@ -240,12 +253,25 @@  #define MACB_WOL_MTI_OFFSET			19  #define MACB_WOL_MTI_SIZE			1 +/* Bitfields in MID */ +#define MACB_IDNUM_OFFSET			16 +#define MACB_IDNUM_SIZE				16 + +/* Bitfields in DCFG1 */  /* Constants for CLK */  #define MACB_CLK_DIV8				0  #define MACB_CLK_DIV16				1  #define MACB_CLK_DIV32				2  #define MACB_CLK_DIV64				3 +/* GEM specific constants for CLK */ +#define GEM_CLK_DIV8				0 +#define GEM_CLK_DIV16				1 +#define GEM_CLK_DIV32				2 +#define GEM_CLK_DIV48				3 +#define GEM_CLK_DIV64				4 +#define GEM_CLK_DIV96				5 +  /* Constants for MAN register */  #define MACB_MAN_SOF				1  #define MACB_MAN_WRITE				1 @@ -255,21 +281,38 @@  /* Bit manipulation macros */  #define MACB_BIT(name)					\  	(1 << MACB_##name##_OFFSET) -#define MACB_BF(name,value)				\ +#define MACB_BF(name, value)				\  	(((value) & ((1 << MACB_##name##_SIZE) - 1))	\  	 << MACB_##name##_OFFSET) -#define MACB_BFEXT(name,value)\ +#define MACB_BFEXT(name, value)\  	(((value) >> MACB_##name##_OFFSET)		\  	 & ((1 << MACB_##name##_SIZE) - 1)) -#define MACB_BFINS(name,value,old)			\ +#define MACB_BFINS(name, value, old)			\  	(((old) & ~(((1 << MACB_##name##_SIZE) - 1)	\  		    << MACB_##name##_OFFSET))		\ -	 | MACB_BF(name,value)) +	 | MACB_BF(name, value)) + +#define GEM_BIT(name)					\ +	(1 << GEM_##name##_OFFSET) +#define GEM_BF(name, value)				\ +	(((value) & ((1 << GEM_##name##_SIZE) - 1))	\ +	 << GEM_##name##_OFFSET) +#define GEM_BFEXT(name, value)\ +	(((value) >> GEM_##name##_OFFSET)		\ +	 & ((1 << GEM_##name##_SIZE) - 1)) +#define GEM_BFINS(name, value, old)			\ +	(((old) & ~(((1 << GEM_##name##_SIZE) - 1)	\ +		    << GEM_##name##_OFFSET))		\ +	 | GEM_BF(name, value))  /* Register access macros */ -#define macb_readl(port,reg)				\ +#define macb_readl(port, reg)				\  	readl((port)->regs + MACB_##reg) -#define macb_writel(port,reg,value)			\ +#define macb_writel(port, reg, value)			\  	writel((value), (port)->regs + MACB_##reg) +#define gem_readl(port, reg)				\ +	readl((port)->regs + GEM_##reg) +#define gem_writel(port, reg, value)			\ +	writel((value), (port)->regs + GEM_##reg)  #endif /* __DRIVERS_MACB_H__ */ |