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>

4 files changed, 15 insertions, 15 deletions

diff --git a/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch b/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch
index 22d62f0960..ddc8290205 100644
--- a/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch
+++ b/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch
@@ -3403,7 +3403,7 @@
  
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-@@ -292,6 +292,7 @@ stmmac_probe_config_dt(struct platform_d
+@@ -291,6 +291,7 @@ stmmac_probe_config_dt(struct platform_d
  	if (of_device_is_compatible(np, "snps,dwmac-4.00") ||
  	    of_device_is_compatible(np, "snps,dwmac-4.10a")) {
  		plat->has_gmac4 = 1;
@@ -3411,7 +3411,7 @@
  		plat->pmt = 1;
  		plat->tso_en = of_property_read_bool(np, "snps,tso");
  	}
-@@ -303,21 +304,25 @@ stmmac_probe_config_dt(struct platform_d
+@@ -302,21 +303,25 @@ stmmac_probe_config_dt(struct platform_d
  		plat->force_sf_dma_mode = 1;
  	}
  
@@ -3452,7 +3452,7 @@
  	plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode");
  	if (plat->force_thresh_dma_mode) {
  		plat->force_sf_dma_mode = 0;
-@@ -445,9 +450,7 @@ static int stmmac_pltfr_suspend(struct d
+@@ -444,9 +449,7 @@ static int stmmac_pltfr_suspend(struct d
  	struct platform_device *pdev = to_platform_device(dev);
  
  	ret = stmmac_suspend(dev);
@@ -3463,7 +3463,7 @@
  		priv->plat->exit(pdev, priv->plat->bsp_priv);
  
  	return ret;
-@@ -466,9 +469,7 @@ static int stmmac_pltfr_resume(struct de
+@@ -465,9 +468,7 @@ static int stmmac_pltfr_resume(struct de
  	struct stmmac_priv *priv = netdev_priv(ndev);
  	struct platform_device *pdev = to_platform_device(dev);
  
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)
  {
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 */
diff --git a/target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch b/target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch
index abdc618e6b..12b8ad04e1 100644
--- a/target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch
+++ b/target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch
@@ -1879,7 +1879,7 @@
  
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-@@ -309,6 +309,13 @@ static int stmmac_dt_phy(struct plat_stm
+@@ -308,6 +308,13 @@ static int stmmac_dt_phy(struct plat_stm
  			 struct device_node *np, struct device *dev)
  {
  	bool mdio = true;
@@ -1893,7 +1893,7 @@
  
  	/* If phy-handle property is passed from DT, use it as the PHY */
  	plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
-@@ -325,8 +332,7 @@ static int stmmac_dt_phy(struct plat_stm
+@@ -324,8 +331,7 @@ static int stmmac_dt_phy(struct plat_stm
  		mdio = false;
  	}