aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-18 12:01:18 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-19 10:00:48 +0200
commitdbd067013d05d240b44f1c75fffde6573f8c86bd (patch)
tree082d63e7c6cd02af58a4e3188ddbf36a2f77ae31 /target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
parent486dc7583d8d6cc9f57d4bf9781ff5680181feee (diff)
downloadupstream-dbd067013d05d240b44f1c75fffde6573f8c86bd.tar.gz
upstream-dbd067013d05d240b44f1c75fffde6573f8c86bd.tar.bz2
upstream-dbd067013d05d240b44f1c75fffde6573f8c86bd.zip
kernel: bump 4.9 to 4.9.134
Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch')
-rw-r--r--target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch b/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
index 2ce23e2eb5..5f89e4b728 100644
--- a/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
+++ b/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
@@ -2132,7 +2132,7 @@
The full GNU General Public License is included in this distribution in
the file called "COPYING".
-@@ -121,7 +117,6 @@ static struct stmmac_axi *stmmac_axi_set
+@@ -120,7 +116,6 @@ static struct stmmac_axi *stmmac_axi_set
axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en");
axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm");
axi->axi_kbbe = of_property_read_bool(np, "snps,axi_kbbe");
@@ -2140,7 +2140,7 @@
axi->axi_fb = of_property_read_bool(np, "snps,axi_fb");
axi->axi_mb = of_property_read_bool(np, "snps,axi_mb");
axi->axi_rb = of_property_read_bool(np, "snps,axi_rb");
-@@ -181,10 +176,19 @@ static int stmmac_dt_phy(struct plat_stm
+@@ -180,10 +175,19 @@ static int stmmac_dt_phy(struct plat_stm
mdio = false;
}
@@ -2164,7 +2164,7 @@
}
if (plat->mdio_node) {
-@@ -249,6 +253,9 @@ stmmac_probe_config_dt(struct platform_d
+@@ -248,6 +252,9 @@ stmmac_probe_config_dt(struct platform_d
plat->force_sf_dma_mode =
of_property_read_bool(np, "snps,force_sf_dma_mode");
@@ -2174,7 +2174,7 @@
/* Set the maxmtu to a default of JUMBO_LEN in case the
* parameter is not present in the device tree.
*/
-@@ -333,7 +340,54 @@ stmmac_probe_config_dt(struct platform_d
+@@ -332,7 +339,54 @@ stmmac_probe_config_dt(struct platform_d
plat->axi = stmmac_axi_setup(pdev);
@@ -2229,7 +2229,7 @@
}
/**
-@@ -357,7 +411,7 @@ void stmmac_remove_config_dt(struct plat
+@@ -356,7 +410,7 @@ void stmmac_remove_config_dt(struct plat
struct plat_stmmacenet_data *
stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
{