aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-14 14:42:28 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-20 13:43:56 +0100
commit9298c443df2fd540fa929c879fb71867ee518e5a (patch)
tree612a4fc965e346c9dce7d206af7c0614045ed6c6 /target/linux/sunxi
parentd46b00cf0f9951267ab5af3b2db5cb4d4e14621e (diff)
downloadupstream-9298c443df2fd540fa929c879fb71867ee518e5a.tar.gz
upstream-9298c443df2fd540fa929c879fb71867ee518e5a.tar.bz2
upstream-9298c443df2fd540fa929c879fb71867ee518e5a.zip
kernel: bump 4.14 to 4.14.164
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/sunxi')
-rw-r--r--target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch10
-rw-r--r--target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch2
2 files changed, 6 insertions, 6 deletions
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 b354c13347..9f7f89c7e2 100644
--- 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
@@ -329,7 +329,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
if (!of_property_read_u32(node, "allwinner,tx-delay-ps", &val)) {
-@@ -747,81 +896,21 @@ static void sun8i_dwmac_unset_syscon(str
+@@ -750,81 +899,21 @@ static void sun8i_dwmac_unset_syscon(str
regmap_write(gmac->regmap, SYSCON_EMAC_REG, reg);
}
@@ -420,7 +420,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
clk_disable_unprepare(gmac->tx_clk);
-@@ -850,7 +939,7 @@ static struct mac_device_info *sun8i_dwm
+@@ -853,7 +942,7 @@ static struct mac_device_info *sun8i_dwm
if (!mac)
return NULL;
@@ -429,7 +429,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (ret)
return NULL;
-@@ -892,6 +981,8 @@ static int sun8i_dwmac_probe(struct plat
+@@ -895,6 +984,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)
-@@ -935,29 +1026,6 @@ static int sun8i_dwmac_probe(struct plat
+@@ -938,29 +1029,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.
-@@ -976,9 +1044,34 @@ static int sun8i_dwmac_probe(struct plat
+@@ -979,9 +1047,34 @@ static int sun8i_dwmac_probe(struct plat
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
if (ret)
diff --git a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
index 02115c832b..0e8d808b42 100644
--- a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
+++ b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-@@ -1075,6 +1075,14 @@ return ret;
+@@ -1078,6 +1078,14 @@ return ret;
}
static const struct of_device_id sun8i_dwmac_match[] = {