diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-18 12:01:18 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-19 10:00:48 +0200 |
| commit | dbd067013d05d240b44f1c75fffde6573f8c86bd (patch) | |
| tree | 082d63e7c6cd02af58a4e3188ddbf36a2f77ae31 /target/linux/sunxi/patches-4.9/0052-stmmac-form-4-12.patch | |
| parent | 486dc7583d8d6cc9f57d4bf9781ff5680181feee (diff) | |
| download | upstream-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/0052-stmmac-form-4-12.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.9/0052-stmmac-form-4-12.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/sunxi/patches-4.9/0052-stmmac-form-4-12.patch b/target/linux/sunxi/patches-4.9/0052-stmmac-form-4-12.patch index a1b018186f..8b7327d915 100644 --- a/target/linux/sunxi/patches-4.9/0052-stmmac-form-4-12.patch +++ b/target/linux/sunxi/patches-4.9/0052-stmmac-form-4-12.patch @@ -5642,7 +5642,7 @@ --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -@@ -108,7 +108,7 @@ static struct stmmac_axi *stmmac_axi_set +@@ -107,7 +107,7 @@ static struct stmmac_axi *stmmac_axi_set if (!np) return NULL; @@ -5651,7 +5651,7 @@ if (!axi) { of_node_put(np); return ERR_PTR(-ENOMEM); -@@ -132,6 +132,155 @@ static struct stmmac_axi *stmmac_axi_set +@@ -131,6 +131,155 @@ static struct stmmac_axi *stmmac_axi_set } /** @@ -5807,7 +5807,7 @@ * stmmac_dt_phy - parse device-tree driver parameters to allocate PHY resources * @plat: driver data platform structure * @np: device tree node -@@ -340,6 +489,8 @@ stmmac_probe_config_dt(struct platform_d +@@ -339,6 +488,8 @@ stmmac_probe_config_dt(struct platform_d plat->axi = stmmac_axi_setup(pdev); @@ -5816,7 +5816,7 @@ /* clock setup */ plat->stmmac_clk = devm_clk_get(&pdev->dev, STMMAC_RESOURCE_NAME); -@@ -359,13 +510,12 @@ stmmac_probe_config_dt(struct platform_d +@@ -358,13 +509,12 @@ stmmac_probe_config_dt(struct platform_d clk_prepare_enable(plat->pclk); /* Fall-back to main clock in case of no PTP ref is passed */ |