aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2014-09-16 14:34:18 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-16 16:50:14 -0400
commitbf3c228d36c6b3c90074f928e84e318621969cc6 (patch)
treef1ff40056cdd3e135d8e878c6574780e42fc0b39
parent9f6c38e70b6c7ea379394a755fe76e09996f5370 (diff)
net: fec: fix build error at m68k platform
reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 4d494cdc92b3b9a0f5fb9e1560810fa27d5a0489 make.cross ARCH=m68k m5272c3_defconfig make.cross ARCH=m68k drivers/net/ethernet/freescale/fec.h:262:0: warning: "FEC_R_DES_START" redefined #define FEC_R_DES_START(X) ((X == 1) ? FEC_R_DES_START_1 : \ ^ drivers/net/ethernet/freescale/fec.h:158:0: note: this is the location of the previous definition #define FEC_R_DES_START 0x3d0 /* Receive descriptor ring */ ^ drivers/net/ethernet/freescale/fec.h:265:0: warning: "FEC_X_DES_START" redefined #define FEC_X_DES_START(X) ((X == 1) ? FEC_X_DES_START_1 : \ ... Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fec.h30
1 files changed, 25 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index b7c77229f1e9..e1bcb4fc244a 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -140,8 +140,12 @@
140#define FEC_IEVENT 0x004 /* Interrupt even reg */ 140#define FEC_IEVENT 0x004 /* Interrupt even reg */
141#define FEC_IMASK 0x008 /* Interrupt mask reg */ 141#define FEC_IMASK 0x008 /* Interrupt mask reg */
142#define FEC_IVEC 0x00c /* Interrupt vec status reg */ 142#define FEC_IVEC 0x00c /* Interrupt vec status reg */
143#define FEC_R_DES_ACTIVE 0x010 /* Receive descriptor reg */ 143#define FEC_R_DES_ACTIVE_0 0x010 /* Receive descriptor reg */
144#define FEC_X_DES_ACTIVE 0x014 /* Transmit descriptor reg */ 144#define FEC_R_DES_ACTIVE_1 FEC_R_DES_ACTIVE_0
145#define FEC_R_DES_ACTIVE_2 FEC_R_DES_ACTIVE_0
146#define FEC_X_DES_ACTIVE_0 0x014 /* Transmit descriptor reg */
147#define FEC_X_DES_ACTIVE_1 FEC_X_DES_ACTIVE_0
148#define FEC_X_DES_ACTIVE_2 FEC_X_DES_ACTIVE_0
145#define FEC_MII_DATA 0x040 /* MII manage frame reg */ 149#define FEC_MII_DATA 0x040 /* MII manage frame reg */
146#define FEC_MII_SPEED 0x044 /* MII speed control reg */ 150#define FEC_MII_SPEED 0x044 /* MII speed control reg */
147#define FEC_R_BOUND 0x08c /* FIFO receive bound reg */ 151#define FEC_R_BOUND 0x08c /* FIFO receive bound reg */
@@ -155,11 +159,27 @@
155#define FEC_ADDR_HIGH 0x3c4 /* High 16bits MAC address */ 159#define FEC_ADDR_HIGH 0x3c4 /* High 16bits MAC address */
156#define FEC_GRP_HASH_TABLE_HIGH 0x3c8 /* High 32bits hash table */ 160#define FEC_GRP_HASH_TABLE_HIGH 0x3c8 /* High 32bits hash table */
157#define FEC_GRP_HASH_TABLE_LOW 0x3cc /* Low 32bits hash table */ 161#define FEC_GRP_HASH_TABLE_LOW 0x3cc /* Low 32bits hash table */
158#define FEC_R_DES_START 0x3d0 /* Receive descriptor ring */ 162#define FEC_R_DES_START_0 0x3d0 /* Receive descriptor ring */
159#define FEC_X_DES_START 0x3d4 /* Transmit descriptor ring */ 163#define FEC_R_DES_START_1 FEC_R_DES_START_0
164#define FEC_R_DES_START_2 FEC_R_DES_START_0
165#define FEC_X_DES_START_0 0x3d4 /* Transmit descriptor ring */
166#define FEC_X_DES_START_1 FEC_X_DES_START_0
167#define FEC_X_DES_START_2 FEC_X_DES_START_0
160#define FEC_R_BUFF_SIZE 0x3d8 /* Maximum receive buff size */ 168#define FEC_R_BUFF_SIZE 0x3d8 /* Maximum receive buff size */
161#define FEC_FIFO_RAM 0x400 /* FIFO RAM buffer */ 169#define FEC_FIFO_RAM 0x400 /* FIFO RAM buffer */
162 170/* Not existed in real chip
171 * Just for pass build.
172 */
173#define FEC_RCMR_1 0xFFF
174#define FEC_RCMR_2 0xFFF
175#define FEC_DMA_CFG_1 0xFFF
176#define FEC_DMA_CFG_2 0xFFF
177#define FEC_TXIC0 0xFFF
178#define FEC_TXIC1 0xFFF
179#define FEC_TXIC2 0xFFF
180#define FEC_RXIC0 0xFFF
181#define FEC_RXIC1 0xFFF
182#define FEC_RXIC2 0xFFF
163#endif /* CONFIG_M5272 */ 183#endif /* CONFIG_M5272 */
164 184
165 185