From: Tom Rini <trini@konsulko.com>
Date: Thu, 28 Jan 2016 23:42:10 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-net
X-Git-Tag: v2025.01-rc5-pxa1908~10442
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=82d72a1b9967cff4908f22c57536c3660f794401;p=u-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-net
---

82d72a1b9967cff4908f22c57536c3660f794401
diff --cc drivers/net/tsec.c
index 9b09caf8c8,025e7a76f1..be0f38288f
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@@ -630,11 -707,13 +707,13 @@@ static int tsec_initialize(bd_t *bis, s
  	priv->phyregs_sgmii = tsec_info->miiregs_sgmii;
  
  	priv->phyaddr = tsec_info->phyaddr;
+ 	priv->tbiaddr = CONFIG_SYS_TBIPA_VALUE;
  	priv->flags = tsec_info->flags;
  
 -	sprintf(dev->name, tsec_info->devname);
 +	strcpy(dev->name, tsec_info->devname);
  	priv->interface = tsec_info->interface;
  	priv->bus = miiphy_get_dev_by_name(tsec_info->mii_devname);
+ 	priv->dev = dev;
  	dev->iobase = 0;
  	dev->priv = priv;
  	dev->init = tsec_init;