diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c index cbefe9e..b474a64 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c @@ -345,6 +345,7 @@ static int dwmac1000_irq_status(struct mac_device_info *hw, static void dwmac1000_set_eee_mode(struct mac_device_info *hw) { +#if 0 void __iomem *ioaddr = hw->pcsr; u32 value; @@ -355,6 +356,7 @@ static void dwmac1000_set_eee_mode(struct mac_device_info *hw) value = readl(ioaddr + LPI_CTRL_STATUS); value |= LPI_CTRL_STATUS_LPIEN | LPI_CTRL_STATUS_LPITXA; writel(value, ioaddr + LPI_CTRL_STATUS); +#endif } static void dwmac1000_reset_eee_mode(struct mac_device_info *hw) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c index 99074695..b7d3034 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c @@ -42,7 +42,7 @@ static void dwmac1000_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi) value |= DMA_AXI_EN_LPI; if (axi->axi_xit_frm) value |= DMA_AXI_LPI_XIT_FRM; - +value &= DMA_AXI_EN_LPI; value |= (axi->axi_wr_osr_lmt & DMA_AXI_WR_OSR_LMT_MASK) << DMA_AXI_WR_OSR_LMT_SHIFT; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 4c8c60a..f477ec0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -312,6 +312,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv) spin_unlock_irqrestore(&priv->lock, flags); goto out; } +#if 0 /* Activate the EEE and start timers */ spin_lock_irqsave(&priv->lock, flags); if (!priv->eee_active) { @@ -333,6 +334,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv) spin_unlock_irqrestore(&priv->lock, flags); pr_debug("stmmac: Energy-Efficient Ethernet initialized\n"); +#endif } out: return ret;