summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBastian Ruppert <Bastian.Ruppert@Sewerin.de>2012-09-13 22:29:03 +0000
committerTom Rini <trini@ti.com>2012-10-01 10:02:13 -0700
commitde575502944576408c1de31cfbdff80447086073 (patch)
tree0e431ee4e6ca2047c56108f3abd98c7487088773 /drivers/net
parent4b7d3a0e80b32a7b64282ff91ff660c0e52e2be0 (diff)
downloadtalos-obmc-uboot-de575502944576408c1de31cfbdff80447086073.tar.gz
talos-obmc-uboot-de575502944576408c1de31cfbdff80447086073.zip
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 <sudhakar.raj@ti.com> CC: Lad, Prabhakar <prabhakar.lad@ti.com> CC: Hadli, Manjunath <manjunath.hadli@ti.com> CC: sbabic@denx.de Acked-by: Stefano Babic <sbabic@denx.de> CC: Tom Rini <trini@ti.com> Signed-off-by: Bastian Ruppert <Bastian.Ruppert@Sewerin.de> Acked-by: Prabhakar Lad <prabhakar.lad@ti.com>
Diffstat (limited to 'drivers/net')
-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 b2516d1768..1db586d6b2 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);
OpenPOWER on IntegriCloud