diff options
author | Tom Rini <trini@ti.com> | 2014-11-07 21:18:35 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-07 21:18:35 (GMT) |
commit | cfa1bd0774eafcba4791bad4d66f01b8f0dc6f94 (patch) | |
tree | 13740fe096447814d65871bc9c15bbac26b0e854 /drivers/net/keystone_net.c | |
parent | 11ada9225a16ed2d8ddbf0715a2416245a777cbc (diff) | |
parent | 40bbd52a79bdf2175a2e44272bead2bc194a3293 (diff) | |
download | u-boot-cfa1bd0774eafcba4791bad4d66f01b8f0dc6f94.tar.xz |
Merge git://git.denx.de/u-boot-ti
Diffstat (limited to 'drivers/net/keystone_net.c')
-rw-r--r-- | drivers/net/keystone_net.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c index c8681d0..bedab1d 100644 --- a/drivers/net/keystone_net.c +++ b/drivers/net/keystone_net.c @@ -315,7 +315,7 @@ int mac_sl_config(u_int16_t port, struct mac_sl_cfg *cfg) writel(cfg->max_rx_len, DEVICE_EMACSL_BASE(port) + CPGMACSL_REG_MAXLEN); writel(cfg->ctl, DEVICE_EMACSL_BASE(port) + CPGMACSL_REG_CTL); -#ifdef CONFIG_K2E_EVM +#if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L) /* Map RX packet flow priority to 0 */ writel(0, DEVICE_EMACSL_BASE(port) + CPGMACSL_REG_RX_PRI_MAP); #endif @@ -400,6 +400,9 @@ static int keystone2_eth_open(struct eth_device *dev, bd_t *bis) keystone2_net_serdes_setup(); + if (sys_has_mdio) + keystone2_mdio_reset(mdio_bus); + keystone_sgmii_config(phy_dev, eth_priv->slave_port - 1, eth_priv->sgmii_link_type); @@ -582,7 +585,7 @@ static void keystone2_net_serdes_setup(void) &ks2_serdes_sgmii_156p25mhz, CONFIG_KSNET_SERDES_LANES_PER_SGMII); -#ifdef CONFIG_SOC_K2E +#if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L) ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE, &ks2_serdes_sgmii_156p25mhz, CONFIG_KSNET_SERDES_LANES_PER_SGMII); |