kernel: update kernel 4.4 to version 4.4.15

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

7 files changed, 22 insertions, 22 deletions

diff --git a/target/linux/ramips/patches-4.4/0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch b/target/linux/ramips/patches-4.4/0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch
index 4107d49ce6..1cac9a22bc 100644
--- a/target/linux/ramips/patches-4.4/0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch
+++ b/target/linux/ramips/patches-4.4/0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch
@@ -1420,7 +1420,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  /*
   * Returns zero if the TRB isn't in this segment, otherwise it returns the DMA
-@@ -3065,17 +3066,22 @@ static u32 xhci_td_remainder(struct xhci
+@@ -3083,17 +3084,22 @@ static u32 xhci_td_remainder(struct xhci
  {
  	u32 maxp, total_packet_count;
  
@@ -1447,7 +1447,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	/* Queueing functions don't count the current TRB into transferred */
  	return (total_packet_count - ((transferred + trb_buff_len) / maxp));
  }
-@@ -3463,7 +3469,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
+@@ -3481,7 +3487,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
  		field |= 0x1;
  
  	/* xHCI 1.0/1.1 6.4.1.2.1: Transfer Type field */
@@ -1479,7 +1479,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	writel(temp, &xhci->ir_set->irq_control);
  
  	/* Set the HCD state before we enable the irqs */
-@@ -1701,6 +1706,9 @@ int xhci_drop_endpoint(struct usb_hcd *h
+@@ -1704,6 +1709,9 @@ int xhci_drop_endpoint(struct usb_hcd *h
  
  	xhci_endpoint_zero(xhci, xhci->devs[udev->slot_id], ep);
  
@@ -1489,7 +1489,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	xhci_dbg(xhci, "drop ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x\n",
  			(unsigned int) ep->desc.bEndpointAddress,
  			udev->slot_id,
-@@ -1796,6 +1804,15 @@ int xhci_add_endpoint(struct usb_hcd *hc
+@@ -1799,6 +1807,15 @@ int xhci_add_endpoint(struct usb_hcd *hc
  		return -ENOMEM;
  	}
  
diff --git a/target/linux/ramips/patches-4.4/0085-pinmux-util.patch b/target/linux/ramips/patches-4.4/0085-pinmux-util.patch
index 4acbc3311f..e2f1d60051 100644
--- a/target/linux/ramips/patches-4.4/0085-pinmux-util.patch
+++ b/target/linux/ramips/patches-4.4/0085-pinmux-util.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ralink/mt7620.c
 +++ b/arch/mips/ralink/mt7620.c
-@@ -176,7 +176,7 @@
+@@ -176,7 +176,7 @@ static struct rt2880_pmx_func spi_cs1_gr
  
  static struct rt2880_pmx_func spis_grp_mt7628[] = {
  	FUNC("pwm", 3, 14, 4),
@@ -9,7 +9,7 @@
  	FUNC("gpio", 1, 14, 4),
  	FUNC("spis", 0, 14, 4),
  };
-@@ -190,28 +190,28 @@
+@@ -190,28 +190,28 @@ static struct rt2880_pmx_func gpio_grp_m
  
  static struct rt2880_pmx_func p4led_kn_grp_mt7628[] = {
  	FUNC("jtag", 3, 30, 1),
@@ -42,7 +42,7 @@
  	FUNC("gpio", 1, 33, 1),
  	FUNC("p1led_kn", 0, 33, 1),
  };
-@@ -232,28 +232,28 @@
+@@ -232,28 +232,28 @@ static struct rt2880_pmx_func wled_kn_gr
  
  static struct rt2880_pmx_func p4led_an_grp_mt7628[] = {
  	FUNC("jtag", 3, 39, 1),
diff --git a/target/linux/ramips/patches-4.4/0085-sdhci-no-wp.patch b/target/linux/ramips/patches-4.4/0085-sdhci-no-wp.patch
index 46b1a6c04c..8bb0352ac2 100644
--- a/target/linux/ramips/patches-4.4/0085-sdhci-no-wp.patch
+++ b/target/linux/ramips/patches-4.4/0085-sdhci-no-wp.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mmc/host/mtk-mmc/sd.c
 +++ b/drivers/mmc/host/mtk-mmc/sd.c
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ struct msdc_hw msdc0_hw = {
  	.dat_drv        = 4,
  	.data_pins      = 4,
  	.data_offset    = 0,
@@ -9,7 +9,7 @@
  //	.flags          = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,
  };
  
-@@ -2746,6 +2746,9 @@
+@@ -2746,6 +2746,9 @@ static int msdc_drv_probe(struct platfor
      int ret, irq;
   
      pdev->dev.platform_data = &msdc0_hw;
diff --git a/target/linux/ramips/patches-4.4/0105-set_mt7621_soc_type.patch b/target/linux/ramips/patches-4.4/0105-set_mt7621_soc_type.patch
index 0ffe82545e..9896ebb1d2 100644
--- a/target/linux/ramips/patches-4.4/0105-set_mt7621_soc_type.patch
+++ b/target/linux/ramips/patches-4.4/0105-set_mt7621_soc_type.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ralink/mt7621.c
 +++ b/arch/mips/ralink/mt7621.c
-@@ -180,7 +180,7 @@
+@@ -180,7 +180,7 @@ void prom_soc_init(struct ralink_soc_inf
  	} else {
  		panic("mt7621: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
  	}
diff --git a/target/linux/ramips/patches-4.4/0519-gsw_mt7621.patch b/target/linux/ramips/patches-4.4/0519-gsw_mt7621.patch
index c5e73d5ca8..67e9060ea0 100644
--- a/target/linux/ramips/patches-4.4/0519-gsw_mt7621.patch
+++ b/target/linux/ramips/patches-4.4/0519-gsw_mt7621.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/mediatek/mt7530.c
 +++ b/drivers/net/ethernet/mediatek/mt7530.c
-@@ -539,6 +539,7 @@
+@@ -539,6 +539,7 @@ mt7530_apply_config(struct switch_dev *d
  		u8 etags = priv->vlan_entries[i].etags;
  		u32 val;
  
@@ -8,7 +8,7 @@
  		/* vid of vlan */
  		val = mt7530_r32(priv, REG_ESW_VLAN_VTIM(i));
  		if (i % 2 == 0) {
-@@ -549,7 +550,7 @@
+@@ -549,7 +550,7 @@ mt7530_apply_config(struct switch_dev *d
  			val |= (vid << 12);
  		}
  		mt7530_w32(priv, REG_ESW_VLAN_VTIM(i), val);
@@ -17,7 +17,7 @@
  		/* vlan port membership */
  		if (member)
  			mt7530_w32(priv, REG_ESW_VLAN_VAWD1, REG_ESW_VLAN_VAWD1_IVL_MAC |
-@@ -569,7 +570,11 @@
+@@ -569,7 +570,11 @@ mt7530_apply_config(struct switch_dev *d
  		mt7530_w32(priv, REG_ESW_VLAN_VAWD2, val);
  
  		/* write to vlan table */
diff --git a/target/linux/ramips/patches-4.4/0520-esw-gmac.patch b/target/linux/ramips/patches-4.4/0520-esw-gmac.patch
index 9d4cd3f4c1..ae5fa16d66 100644
--- a/target/linux/ramips/patches-4.4/0520-esw-gmac.patch
+++ b/target/linux/ramips/patches-4.4/0520-esw-gmac.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/mediatek/esw_rt3050.c
 +++ b/drivers/net/ethernet/mediatek/esw_rt3050.c
-@@ -221,6 +221,8 @@
+@@ -221,6 +221,8 @@ struct rt305x_esw {
  
  	unsigned char		port_map;
  	unsigned char		port_disable;
@@ -9,7 +9,7 @@
  	unsigned int		reg_led_polarity;
  
  	struct switch_dev	swdev;
-@@ -452,7 +454,10 @@
+@@ -452,7 +454,10 @@ static void esw_hw_init(struct rt305x_es
  		      (RT305X_ESW_PORTS_NOCPU << RT305X_ESW_POC2_UNTAG_EN_S)),
  		RT305X_ESW_REG_POC2);
  
@@ -21,7 +21,7 @@
  
  	/* 300s aging timer, max packet len 1536, broadcast storm prevention
  	 * disabled, disable collision abort, mac xor48 hash, 10 packet back
-@@ -475,7 +480,10 @@
+@@ -475,7 +480,10 @@ static void esw_hw_init(struct rt305x_es
  	 * port5: disabled
  	 * port6: enabled, gige, full-duplex, rx/tx-flow-control
  	 */
@@ -33,7 +33,7 @@
  	esw_w32(esw, 0x00000000, RT305X_ESW_REG_FPA);
  
  	/* Force Link/Activity on ports */
-@@ -1361,6 +1369,14 @@
+@@ -1361,6 +1369,14 @@ static int esw_probe(struct platform_dev
  	if (port_disable)
  		esw->port_disable = be32_to_cpu(*port_disable);
  
@@ -48,7 +48,7 @@
  	reg_init = of_get_property(np, "mediatek,led_polarity", NULL);
  	if (reg_init)
  		esw->reg_led_polarity = be32_to_cpu(*reg_init);
-@@ -1386,6 +1402,18 @@
+@@ -1386,6 +1402,18 @@ static int esw_probe(struct platform_dev
  
  	esw_hw_init(esw);
  
diff --git a/target/linux/ramips/patches-4.4/0720-arch-mips-ralink-add-i2c-clocks.patch b/target/linux/ramips/patches-4.4/0720-arch-mips-ralink-add-i2c-clocks.patch
index 500625b4e5..e9e72ad11a 100644
--- a/target/linux/ramips/patches-4.4/0720-arch-mips-ralink-add-i2c-clocks.patch
+++ b/target/linux/ramips/patches-4.4/0720-arch-mips-ralink-add-i2c-clocks.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ralink/mt7620.c
 +++ b/arch/mips/ralink/mt7620.c
-@@ -509,6 +509,7 @@ void __init ralink_clk_init(void)
+@@ -513,6 +513,7 @@ void __init ralink_clk_init(void)
  	unsigned long sys_rate;
  	unsigned long dram_rate;
  	unsigned long periph_rate;
@@ -8,7 +8,7 @@
  
  	xtal_rate = mt7620_get_xtal_rate();
  
-@@ -523,6 +524,7 @@ void __init ralink_clk_init(void)
+@@ -527,6 +528,7 @@ void __init ralink_clk_init(void)
  			cpu_rate = MHZ(575);
  		dram_rate = sys_rate = cpu_rate / 3;
  		periph_rate = MHZ(40);
@@ -16,7 +16,7 @@
  
  		ralink_clk_add("10000d00.uartlite", periph_rate);
  		ralink_clk_add("10000e00.uartlite", periph_rate);
-@@ -534,6 +536,7 @@ void __init ralink_clk_init(void)
+@@ -538,6 +540,7 @@ void __init ralink_clk_init(void)
  		dram_rate = mt7620_get_dram_rate(pll_rate);
  		sys_rate = mt7620_get_sys_rate(cpu_rate);
  		periph_rate = mt7620_get_periph_rate(xtal_rate);
@@ -24,7 +24,7 @@
  
  		pr_debug(RFMT("XTAL") RFMT("CPU_PLL") RFMT("PLL"),
  			 RINT(xtal_rate), RFRAC(xtal_rate),
-@@ -555,6 +558,8 @@ void __init ralink_clk_init(void)
+@@ -559,6 +562,8 @@ void __init ralink_clk_init(void)
  	ralink_clk_add("cpu", cpu_rate);
  	ralink_clk_add("10000100.timer", periph_rate);
  	ralink_clk_add("10000120.watchdog", periph_rate);