diff options
| author | Khoronzhuk, Ivan <ivan.khoronzhuk@ti.com> | 2014-09-29 22:17:24 +0300 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-23 11:27:05 -0400 |
| commit | 497e9e03216bae505a8f06808975d0c4865622f2 (patch) | |
| tree | f0e67ae954fe2d27c0a1581cf0b39d3e72749fa3 | |
| parent | f0772266103686abf33fbcf87646b7674d494ec1 (diff) | |
| download | u-boot-497e9e03216bae505a8f06808975d0c4865622f2.tar.gz | |
net: keystone_net: remove redundant code from keystone_net.c
Remove unused tx_send_loop variable.
Removes duplicated get_link_status() call from the
keystone2_eth_send_packet().
The emac_gigabit_enable() is called at opening Ethernet and there is no
need to enable it on sending each packet. So remove that call
from keystone2_eth_send_packet() as well.
The calling of power/clock up functions are mostly the responsibility
of SoC/board code, so move these functions to appropriate place.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| -rw-r--r-- | board/ti/ks2_evm/board.c | 9 | ||||
| -rw-r--r-- | drivers/net/keystone_net.c | 17 |
2 files changed, 9 insertions, 17 deletions
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index e1771d253a..279ec8e67b 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -13,6 +13,7 @@ #include <exports.h> #include <fdt_support.h> #include <asm/arch/ddr3.h> +#include <asm/arch/psc_defs.h> #include <asm/ti-common/ti-aemif.h> #include <asm/ti-common/keystone_net.h> @@ -69,6 +70,14 @@ int board_eth_init(bd_t *bis) int port_num; char link_type_name[32]; + /* By default, select PA PLL clock as PA clock source */ + if (psc_enable_module(KS2_LPSC_PA)) + return -1; + if (psc_enable_module(KS2_LPSC_CPGMAC)) + return -1; + if (psc_enable_module(KS2_LPSC_CRYPTO)) + return -1; + port_num = get_num_eth_ports(); for (j = 0; j < port_num; j++) { diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c index edd2bb03bb..33197f95b9 100644 --- a/drivers/net/keystone_net.c +++ b/drivers/net/keystone_net.c @@ -12,12 +12,9 @@ #include <net.h> #include <miiphy.h> #include <malloc.h> -#include <asm/arch/psc_defs.h> #include <asm/ti-common/keystone_nav.h> #include <asm/ti-common/keystone_net.h> -unsigned int emac_dbg; - unsigned int emac_open; static unsigned int sys_has_mdio = 1; @@ -409,9 +406,6 @@ static int keystone2_eth_open(struct eth_device *dev, bd_t *bis) sys_has_mdio = (eth_priv->sgmii_link_type == SGMII_LINK_MAC_PHY) ? 1 : 0; - psc_enable_module(KS2_LPSC_PA); - psc_enable_module(KS2_LPSC_CPGMAC); - sgmii_serdes_setup_156p25mhz(); if (sys_has_mdio) @@ -490,8 +484,6 @@ void keystone2_eth_close(struct eth_device *dev) debug("- emac_close\n"); } -static int tx_send_loop; - /* * This function sends a single packet on the network and returns * positive number (number of bytes transmitted) or negative for error @@ -502,21 +494,12 @@ static int keystone2_eth_send_packet(struct eth_device *dev, int ret_status = -1; struct eth_priv_t *eth_priv = (struct eth_priv_t *)dev->priv; - tx_send_loop = 0; - if (keystone_get_link_status(dev) == 0) return -1; - emac_gigabit_enable(dev); - if (cpmac_drv_send((u32 *)packet, length, eth_priv->slave_port) != 0) return ret_status; - if (keystone_get_link_status(dev) == 0) - return -1; - - emac_gigabit_enable(dev); - return length; } |