summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBastian Ruppert <[email protected]>2012-09-13 22:29:03 +0000
committerTom Rini <[email protected]>2012-10-01 10:02:13 -0700
commitde575502944576408c1de31cfbdff80447086073 (patch)
tree0e431ee4e6ca2047c56108f3abd98c7487088773 /drivers
parent4b7d3a0e80b32a7b64282ff91ff660c0e52e2be0 (diff)
da850/omap-l138: davinci_emac: Suppress auto negotiation if needed
negotiation is enabled in RMII mode. Some boards based on da850 need to suppress this procedure. CC: Rajashekhara, Sudhakar <[email protected]> CC: Lad, Prabhakar <[email protected]> CC: Hadli, Manjunath <[email protected]> CC: [email protected] Acked-by: Stefano Babic <[email protected]> CC: Tom Rini <[email protected]> Signed-off-by: Bastian Ruppert <[email protected]> Acked-by: Prabhakar Lad <[email protected]>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/davinci_emac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index b2516d17689..1db586d6b27 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -897,7 +897,8 @@ int davinci_emac_initialize(void)
}
#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \
- defined(CONFIG_MACH_DAVINCI_DA850_EVM)
+ defined(CONFIG_MACH_DAVINCI_DA850_EVM) && \
+ !defined(CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE)
for (i = 0; i < num_phy; i++) {
if (phy[i].is_phy_connected(i))
phy[i].auto_negotiate(i);