projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synchronize with U-BOOT mainline
[oweals/u-boot.git]
/
drivers
/
tsec.h
diff --git
a/drivers/tsec.h
b/drivers/tsec.h
index 422bc6692292bc43b2f6271ed01d2c6fe4a6dbc9..2f0092ad59888d6502ca245a0da5634b940f558d 100644
(file)
--- a/
drivers/tsec.h
+++ b/
drivers/tsec.h
@@
-7,7
+7,7
@@
* terms of the GNU Public License, Version 2, incorporated
* herein by reference.
*
* terms of the GNU Public License, Version 2, incorporated
* herein by reference.
*
- * Copyright 2004
Freescale Semiconductor
.
+ * Copyright 2004
, 2007 Freescale Semiconductor, Inc
.
* (C) Copyright 2003, Motorola, Inc.
* maintained by Xianghua Xiao (x.xiao@motorola.com)
* author Andy Fleming
* (C) Copyright 2003, Motorola, Inc.
* maintained by Xianghua Xiao (x.xiao@motorola.com)
* author Andy Fleming
@@
-65,11
+65,14
@@
#define ECNTRL_INIT_SETTINGS 0x00001000
#define ECNTRL_TBI_MODE 0x00000020
#define ECNTRL_R100 0x00000008
#define ECNTRL_INIT_SETTINGS 0x00001000
#define ECNTRL_TBI_MODE 0x00000020
#define ECNTRL_R100 0x00000008
+#define ECNTRL_SGMII_MODE 0x00000002
#define miim_end -2
#define miim_read -1
#define miim_end -2
#define miim_read -1
-#define TBIPA_VALUE 0x1f
+#ifndef CFG_TBIPA_VALUE
+ #define CFG_TBIPA_VALUE 0x1f
+#endif
#define MIIMCFG_INIT_VALUE 0x00000003
#define MIIMCFG_RESET 0x80000000
#define MIIMCFG_INIT_VALUE 0x00000003
#define MIIMCFG_RESET 0x80000000