| Submitter | Valentin Longchamp |
|---|---|
| Date | May 4, 2011, 3:53 p.m. |
| Message ID | <e2e295483e81a345bad8a6173008c14d71ff9023.1304523385.git.valentin.longchamp@keymile.com> |
| Download | mbox | patch |
| Permalink | /patch/94083/ |
| State | Accepted |
| Commit | d3920144e132eb7f30d40d4a5ad13ae85d2e2818 |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Comments
Patch
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h index 3de98d0..d8a5429 100644 --- a/drivers/net/mvgbe.h +++ b/drivers/net/mvgbe.h @@ -84,6 +84,7 @@ MVGBE_TX_BURST_SIZE_16_64BIT) /* Default port serial control value */ +#ifndef PORT_SERIAL_CONTROL_VALUE #define PORT_SERIAL_CONTROL_VALUE ( \ MVGBE_FORCE_LINK_PASS | \ MVGBE_DIS_AUTO_NEG_FOR_DUPLX | \ @@ -101,6 +102,7 @@ MVGBE_CLR_EXT_LOOPBACK | \ MVGBE_SET_FULL_DUPLEX_MODE | \ MVGBE_DIS_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX) +#endif /* Tx WRR confoguration macros */ #define PORT_MAX_TRAN_UNIT 0x24 /* MTU register (default) 9KByte */
This allows this configuration to be defined differently for some boards that request it. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Holger Brunck <holger.brunck@keymile.com> cc: Heiko Schocher <hs@denx.de> cc: Wolfgang Denk <wd@denx.de> cc: Detlev Zundel <dzu@denx.de> cc: Prafulla Wadaskar <prafulla@marvell.com> --- Changes for v2: - split up first large patch series to three independent smaller patch series Changes for v3: - taken Prafulla's comments into account, split from previous 07/08 patch drivers/net/mvgbe.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)