Merge branch 'at91-4.14-trunk/net' into linux-4.14-at91

Author: cristibirsan

drivers/net/ethernet/cadence/macb.h

@@ -1080,6 +1080,7 @@ struct macb_ptp_info {
 struct macb_sama5d2_pm_data {
 	u32 etht;
 	u32 usrio;
+	u32 ncr;
 };
 
 struct macb_pm_ops {

drivers/net/ethernet/cadence/macb_main.c

@@ -3925,6 +3925,8 @@ static int __maybe_unused macb_sama5d2_suspend(struct macb *bp)
 	if (!(bp->caps & MACB_CAPS_USRIO_DISABLED))
 		pm_data->usrio = macb_or_gem_readl(bp, USRIO);
 
+	pm_data->ncr = macb_readl(bp, NCR);
+
 	if (netif_running(netdev))
 		macb_close(netdev);
 
@@ -3939,6 +3941,8 @@ static int __maybe_unused macb_sama5d2_resume(struct macb *bp)
 	if (!macb_sama5d2_backup())
 		return -EPERM;
 
+	macb_writel(bp, NCR, pm_data->ncr & MACB_BIT(MPE));
+
 	if (netdev->hw_features & NETIF_F_NTUPLE)
 		gem_writel_n(bp, ETHT, SCRT2_ETHT, pm_data->etht);