diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-20 10:31:41 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-21 09:45:15 +0200 |
| commit | f442b306f9b74e805828d458ab412256d7709ffb (patch) | |
| tree | 9a1fb3b84479a0516f93b8ef8045f333851768ad /target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch | |
| parent | 00324e434e1dbaf7f25d3c85529f92d5917efecb (diff) | |
| download | upstream-f442b306f9b74e805828d458ab412256d7709ffb.tar.gz upstream-f442b306f9b74e805828d458ab412256d7709ffb.tar.bz2 upstream-f442b306f9b74e805828d458ab412256d7709ffb.zip | |
kernel: bump 4.14 to 4.14.120
Refreshed all patches.
Remove upstreamed:
- 103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
- 060-fix-oxnas-rps-dt-match.patch
Altered patches:
- 0067-generic-Mangle-bootloader-s-kernel-arguments.patch
- 006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
- 996-generic-Mangle-bootloader-s-kernel-arguments.patch
Compile-tested on: ar71xx, cns3xxx, imx6, mvebu, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch | 6 |
1 files changed, 3 insertions, 3 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 6cde0e29bc..b354c13347 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 @@ -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) |