kernel: bump 4.14 to 4.14.212

Refreshed all patches.

Removed patches because included in upstream:
- 315-v5.10-usbnet-ipeth-fix-connectivity-with-ios-14.patch

Compile-tested on: ipq40xx, ath79, x86/64
Runtime-tested on: ipq40xx, ath79

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

8 files changed, 27 insertions, 27 deletions

diff --git a/target/linux/ipq40xx/patches-4.14/088-0003-i2c-qup-minor-code-reorganization-for-use_dma.patch b/target/linux/ipq40xx/patches-4.14/088-0003-i2c-qup-minor-code-reorganization-for-use_dma.patch
index a6cbfcf2b0..037233f171 100644
--- a/target/linux/ipq40xx/patches-4.14/088-0003-i2c-qup-minor-code-reorganization-for-use_dma.patch
+++ b/target/linux/ipq40xx/patches-4.14/088-0003-i2c-qup-minor-code-reorganization-for-use_dma.patch
@@ -27,7 +27,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  	struct			dma_pool *dpool;
  	struct			qup_i2c_tag start_tag;
  	struct			qup_i2c_bam brx;
-@@ -1288,7 +1290,7 @@ static int qup_i2c_xfer_v2(struct i2c_ad
+@@ -1289,7 +1291,7 @@ static int qup_i2c_xfer_v2(struct i2c_ad
  			   int num)
  {
  	struct qup_i2c_dev *qup = i2c_get_adapdata(adap);
@@ -36,7 +36,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  
  	qup->bus_err = 0;
  	qup->qup_err = 0;
-@@ -1317,13 +1319,12 @@ static int qup_i2c_xfer_v2(struct i2c_ad
+@@ -1318,13 +1320,12 @@ static int qup_i2c_xfer_v2(struct i2c_ad
  			len = (msgs[idx].len > qup->out_fifo_sz) ||
  			      (msgs[idx].len > qup->in_fifo_sz);
  
@@ -54,7 +54,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  	}
  
  	idx = 0;
-@@ -1347,15 +1348,17 @@ static int qup_i2c_xfer_v2(struct i2c_ad
+@@ -1348,15 +1349,17 @@ static int qup_i2c_xfer_v2(struct i2c_ad
  
  		reinit_completion(&qup->xfer);
  
diff --git a/target/linux/ipq40xx/patches-4.14/088-0004-i2c-qup-remove-redundant-variables-for-BAM-SG-count.patch b/target/linux/ipq40xx/patches-4.14/088-0004-i2c-qup-remove-redundant-variables-for-BAM-SG-count.patch
index e18af41789..bd050ddfca 100644
--- a/target/linux/ipq40xx/patches-4.14/088-0004-i2c-qup-remove-redundant-variables-for-BAM-SG-count.patch
+++ b/target/linux/ipq40xx/patches-4.14/088-0004-i2c-qup-remove-redundant-variables-for-BAM-SG-count.patch
@@ -149,7 +149,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  					      DMA_PREP_INTERRUPT);
  		if (!rxd) {
  			dev_err(qup->dev, "failed to get rx desc\n");
-@@ -844,7 +838,7 @@ static int qup_i2c_bam_do_xfer(struct qu
+@@ -845,7 +839,7 @@ static int qup_i2c_bam_do_xfer(struct qu
  			goto desc_err;
  		}
  
@@ -158,7 +158,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  			writel(QUP_BAM_INPUT_EOT,
  			       qup->base + QUP_OUT_FIFO_BASE);
  
-@@ -862,10 +856,10 @@ static int qup_i2c_bam_do_xfer(struct qu
+@@ -863,10 +857,10 @@ static int qup_i2c_bam_do_xfer(struct qu
  	}
  
  desc_err:
diff --git a/target/linux/ipq40xx/patches-4.14/088-0007-i2c-qup-proper-error-handling-for-i2c-error-in-BAM-m.patch b/target/linux/ipq40xx/patches-4.14/088-0007-i2c-qup-proper-error-handling-for-i2c-error-in-BAM-m.patch
index a86f144caf..48f40847de 100644
--- a/target/linux/ipq40xx/patches-4.14/088-0007-i2c-qup-proper-error-handling-for-i2c-error-in-BAM-m.patch
+++ b/target/linux/ipq40xx/patches-4.14/088-0007-i2c-qup-proper-error-handling-for-i2c-error-in-BAM-m.patch
@@ -67,7 +67,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  		goto done;
  	}
  
-@@ -847,20 +862,12 @@ static int qup_i2c_bam_do_xfer(struct qu
+@@ -848,20 +863,12 @@ static int qup_i2c_bam_do_xfer(struct qu
  			goto desc_err;
  		}
  
diff --git a/target/linux/ipq40xx/patches-4.14/088-0008-i2c-qup-use-the-complete-transfer-length-to-choose-D.patch b/target/linux/ipq40xx/patches-4.14/088-0008-i2c-qup-use-the-complete-transfer-length-to-choose-D.patch
index 3d68695588..e29b95d508 100644
--- a/target/linux/ipq40xx/patches-4.14/088-0008-i2c-qup-use-the-complete-transfer-length-to-choose-D.patch
+++ b/target/linux/ipq40xx/patches-4.14/088-0008-i2c-qup-use-the-complete-transfer-length-to-choose-D.patch
@@ -22,7 +22,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
 
 --- a/drivers/i2c/busses/i2c-qup.c
 +++ b/drivers/i2c/busses/i2c-qup.c
-@@ -1300,7 +1300,8 @@ static int qup_i2c_xfer_v2(struct i2c_ad
+@@ -1301,7 +1301,8 @@ static int qup_i2c_xfer_v2(struct i2c_ad
  			   int num)
  {
  	struct qup_i2c_dev *qup = i2c_get_adapdata(adap);
@@ -32,7 +32,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  
  	qup->bus_err = 0;
  	qup->qup_err = 0;
-@@ -1326,14 +1327,14 @@ static int qup_i2c_xfer_v2(struct i2c_ad
+@@ -1327,14 +1328,14 @@ static int qup_i2c_xfer_v2(struct i2c_ad
  				goto out;
  			}
  
diff --git a/target/linux/ipq40xx/patches-4.14/088-0009-i2c-qup-change-completion-timeout-according-to-trans.patch b/target/linux/ipq40xx/patches-4.14/088-0009-i2c-qup-change-completion-timeout-according-to-trans.patch
index c95d20ec97..07becb9d8a 100644
--- a/target/linux/ipq40xx/patches-4.14/088-0009-i2c-qup-change-completion-timeout-according-to-trans.patch
+++ b/target/linux/ipq40xx/patches-4.14/088-0009-i2c-qup-change-completion-timeout-according-to-trans.patch
@@ -50,7 +50,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  		dev_err(qup->dev, "normal trans timed out\n");
  		ret = -ETIMEDOUT;
  	}
-@@ -1605,6 +1610,8 @@ nodma:
+@@ -1606,6 +1611,8 @@ nodma:
  	 */
  	one_bit_t = (USEC_PER_SEC / clk_freq) + 1;
  	qup->one_byte_t = one_bit_t * 9;
diff --git a/target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch b/target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch
index e5d1edfb72..39d8de8bd1 100644
--- a/target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch
+++ b/target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch
@@ -233,7 +233,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  	/* schedule the EOT and FLUSH I2C tags */
  	len = 1;
  	if (rx_cnt) {
-@@ -886,11 +878,19 @@ desc_err:
+@@ -887,11 +879,19 @@ desc_err:
  	return ret;
  }
  
@@ -253,7 +253,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  
  	enable_irq(qup->irq);
  	ret = qup_i2c_req_dma(qup);
-@@ -913,9 +913,34 @@ static int qup_i2c_bam_xfer(struct i2c_a
+@@ -914,9 +914,34 @@ static int qup_i2c_bam_xfer(struct i2c_a
  		goto out;
  
  	writel(qup->clk_ctl, qup->base + QUP_I2C_CLK_CTL);
@@ -290,7 +290,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  out:
  	disable_irq(qup->irq);
  
-@@ -1468,7 +1493,8 @@ static int qup_i2c_probe(struct platform
+@@ -1469,7 +1494,8 @@ static int qup_i2c_probe(struct platform
  		else if (ret != 0)
  			goto nodma;
  
@@ -300,7 +300,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  		qup->btx.sg = devm_kzalloc(&pdev->dev,
  					   sizeof(*qup->btx.sg) * blocks,
  					   GFP_KERNEL);
-@@ -1611,7 +1637,7 @@ nodma:
+@@ -1612,7 +1638,7 @@ nodma:
  	one_bit_t = (USEC_PER_SEC / clk_freq) + 1;
  	qup->one_byte_t = one_bit_t * 9;
  	qup->xfer_timeout = TOUT_MIN * HZ +
diff --git a/target/linux/ipq40xx/patches-4.14/088-0012-i2c-qup-reorganization-of-driver-code-to-remove-poll.patch b/target/linux/ipq40xx/patches-4.14/088-0012-i2c-qup-reorganization-of-driver-code-to-remove-poll.patch
index 1690415265..caa36c013f 100644
--- a/target/linux/ipq40xx/patches-4.14/088-0012-i2c-qup-reorganization-of-driver-code-to-remove-poll.patch
+++ b/target/linux/ipq40xx/patches-4.14/088-0012-i2c-qup-reorganization-of-driver-code-to-remove-poll.patch
@@ -283,7 +283,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  }
  
  static void qup_i2c_set_blk_data(struct qup_i2c_dev *qup,
-@@ -1006,64 +1075,6 @@ err:
+@@ -1007,64 +1076,6 @@ err:
  	return ret;
  }
  
@@ -348,7 +348,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  static void qup_i2c_set_read_mode_v2(struct qup_i2c_dev *qup, int len)
  {
  	int tx_len = qup->blk.tx_tag_len;
-@@ -1086,44 +1097,27 @@ static void qup_i2c_set_read_mode_v2(str
+@@ -1087,44 +1098,27 @@ static void qup_i2c_set_read_mode_v2(str
  	}
  }
  
@@ -402,7 +402,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  }
  
  static int qup_i2c_read_fifo_v2(struct qup_i2c_dev *qup,
-@@ -1224,49 +1218,130 @@ err:
+@@ -1225,49 +1219,130 @@ err:
  	return ret;
  }
  
@@ -552,7 +552,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  static int qup_i2c_xfer(struct i2c_adapter *adap,
  			struct i2c_msg msgs[],
  			int num)
-@@ -1305,10 +1380,11 @@ static int qup_i2c_xfer(struct i2c_adapt
+@@ -1306,10 +1381,11 @@ static int qup_i2c_xfer(struct i2c_adapt
  			goto out;
  		}
  
@@ -566,7 +566,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  
  		if (ret)
  			break;
-@@ -1487,6 +1563,10 @@ static int qup_i2c_probe(struct platform
+@@ -1488,6 +1564,10 @@ static int qup_i2c_probe(struct platform
  	if (of_device_is_compatible(pdev->dev.of_node, "qcom,i2c-qup-v1.1.1")) {
  		qup->adap.algo = &qup_i2c_algo;
  		qup->adap.quirks = &qup_i2c_quirks;
diff --git a/target/linux/ipq40xx/patches-4.14/088-0013-i2c-qup-reorganization-of-driver-code-to-remove-poll.patch b/target/linux/ipq40xx/patches-4.14/088-0013-i2c-qup-reorganization-of-driver-code-to-remove-poll.patch
index 6d32882117..8fe43938ae 100644
--- a/target/linux/ipq40xx/patches-4.14/088-0013-i2c-qup-reorganization-of-driver-code-to-remove-poll.patch
+++ b/target/linux/ipq40xx/patches-4.14/088-0013-i2c-qup-reorganization-of-driver-code-to-remove-poll.patch
@@ -386,7 +386,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  	qup_i2c_set_blk_data(qup, msg);
  
  	blocks = qup->blk.count;
-@@ -1026,7 +897,7 @@ static int qup_i2c_wait_for_complete(str
+@@ -1027,7 +898,7 @@ static int qup_i2c_wait_for_complete(str
  	unsigned long left;
  	int ret = 0;
  
@@ -395,7 +395,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  	if (!left) {
  		writel(1, qup->base + QUP_SW_RESET);
  		ret = -ETIMEDOUT;
-@@ -1038,65 +909,6 @@ static int qup_i2c_wait_for_complete(str
+@@ -1039,65 +910,6 @@ static int qup_i2c_wait_for_complete(str
  	return ret;
  }
  
@@ -461,7 +461,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  static void qup_i2c_read_rx_fifo_v1(struct qup_i2c_dev *qup)
  {
  	struct qup_i2c_block *blk = &qup->blk;
-@@ -1120,104 +932,6 @@ static void qup_i2c_read_rx_fifo_v1(stru
+@@ -1121,104 +933,6 @@ static void qup_i2c_read_rx_fifo_v1(stru
  		blk->rx_bytes_read = true;
  }
  
@@ -566,7 +566,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  static void qup_i2c_write_rx_tags_v1(struct qup_i2c_dev *qup)
  {
  	struct i2c_msg *msg = qup->msg;
-@@ -1404,13 +1118,434 @@ out:
+@@ -1405,13 +1119,434 @@ out:
  	return ret;
  }
  
@@ -1002,7 +1002,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  
  	qup->bus_err = 0;
  	qup->qup_err = 0;
-@@ -1419,6 +1554,10 @@ static int qup_i2c_xfer_v2(struct i2c_ad
+@@ -1420,6 +1555,10 @@ static int qup_i2c_xfer_v2(struct i2c_ad
  	if (ret < 0)
  		goto out;
  
@@ -1013,7 +1013,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  	writel(1, qup->base + QUP_SW_RESET);
  	ret = qup_i2c_poll_state(qup, QUP_RESET_STATE);
  	if (ret)
-@@ -1428,60 +1567,35 @@ static int qup_i2c_xfer_v2(struct i2c_ad
+@@ -1429,60 +1568,35 @@ static int qup_i2c_xfer_v2(struct i2c_ad
  	writel(I2C_MINI_CORE | I2C_N_VAL_V2, qup->base + QUP_CONFIG);
  	writel(QUP_V2_TAGS_EN, qup->base + QUP_I2C_MASTER_GEN);
  
@@ -1095,7 +1095,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  
  	if (ret == 0)
  		ret = num;
-@@ -1545,6 +1659,7 @@ static int qup_i2c_probe(struct platform
+@@ -1546,6 +1660,7 @@ static int qup_i2c_probe(struct platform
  	u32 src_clk_freq = DEFAULT_SRC_CLK;
  	u32 clk_freq = DEFAULT_CLK_FREQ;
  	int blocks;
@@ -1103,7 +1103,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  
  	qup = devm_kzalloc(&pdev->dev, sizeof(*qup), GFP_KERNEL);
  	if (!qup)
-@@ -1563,12 +1678,10 @@ static int qup_i2c_probe(struct platform
+@@ -1564,12 +1679,10 @@ static int qup_i2c_probe(struct platform
  	if (of_device_is_compatible(pdev->dev.of_node, "qcom,i2c-qup-v1.1.1")) {
  		qup->adap.algo = &qup_i2c_algo;
  		qup->adap.quirks = &qup_i2c_quirks;
@@ -1118,7 +1118,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  		ret = qup_i2c_req_dma(qup);
  
  		if (ret == -EPROBE_DEFER)
-@@ -1694,14 +1807,31 @@ nodma:
+@@ -1695,14 +1808,31 @@ nodma:
  		ret = -EIO;
  		goto fail;
  	}