kernel: bump 4.14 to 4.14.120

[openwrt/staging/dedeckeh.git] / target / linux / sunxi / patches-4.14 / 002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch

diff --git a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch
index 6cde0e29bca466d27afa9fa55d9e88ad7b98ce51..b354c13347a74b7efd1190b3b8efdff02e17bb1d 100644 (file)
--- a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch
+++ b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch
@@ -429,7 +429,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (ret)
                return NULL;
  
-@@ -890,6 +979,8 @@ static int sun8i_dwmac_probe(struct plat
+@@ -892,6 +981,8 @@ static int sun8i_dwmac_probe(struct plat
        struct sunxi_priv_data *gmac;
        struct device *dev = &pdev->dev;
        int ret;
@@ -438,7 +438,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        ret = stmmac_get_platform_resources(pdev, &stmmac_res);
        if (ret)
-@@ -933,29 +1024,6 @@ static int sun8i_dwmac_probe(struct plat
+@@ -935,29 +1026,6 @@ static int sun8i_dwmac_probe(struct plat
        }
  
        plat_dat->interface = of_get_phy_mode(dev->of_node);
@@ -468,7 +468,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        /* platform data specifying hardware features and callbacks.
         * hardware features were copied from Allwinner drivers.
-@@ -974,9 +1042,34 @@ static int sun8i_dwmac_probe(struct plat
+@@ -976,9 +1044,34 @@ static int sun8i_dwmac_probe(struct plat
  
        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
        if (ret)