diff options
| author |   Jiangfeng Xiao <xiaojiangfeng@huawei.com> | 2019-07-09 11:31:05 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-09 14:29:26 -0700 |
| commit | 0331f8550c504aea34c3ab9198f7324ee8b567b8 (patch) | |
| tree | 993e20558018278bea976f5d758b70fdd392d617 /drivers/net/ethernet/hisilicon | |
| parent | net: hisilicon: Cleanup for cast to restricted __be32 (diff) | |
| download | linux-dev-0331f8550c504aea34c3ab9198f7324ee8b567b8.tar.xz linux-dev-0331f8550c504aea34c3ab9198f7324ee8b567b8.zip | |
net: hisilicon: HI13X1_GMAX skip write LOCAL_PAGE_REG
HI13X1_GMAC changed the offsets and bitmaps for
GE_TX_LOCAL_PAGE_REG registers in the same peripheral
device on different models of the hip04_eth. With the
default configuration, HI13X1_GMAC can also work without
any writes to the GE_TX_LOCAL_PAGE_REG register.
Signed-off-by: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hip04_eth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c index d8f0619d27df..fe61b01d41da 100644 --- a/drivers/net/ethernet/hisilicon/hip04_eth.c +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c @@ -308,8 +308,10 @@ static void hip04_config_fifo(struct hip04_priv *priv) val |= GE_RX_STRIP_PAD | GE_RX_PAD_EN; writel_relaxed(val, priv->base + GE_RECV_CONTROL_REG); +#ifndef CONFIG_HI13X1_GMAC val = GE_AUTO_NEG_CTL; writel_relaxed(val, priv->base + GE_TX_LOCAL_PAGE_REG); +#endif } static void hip04_mac_enable(struct net_device *ndev) |