kernel: bump 5.10 to 5.10.183

All patches automatically rebased.

Deactivate new option CONFIG_DRM_RCAR_USE_LVDS by default.

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

4 files changed, 15 insertions, 15 deletions

diff --git a/target/linux/at91/patches-5.10/132-dmaengine-at_xdmac-adapt-perid-for-mem2mem-operation.patch b/target/linux/at91/patches-5.10/132-dmaengine-at_xdmac-adapt-perid-for-mem2mem-operation.patch
index 163f8d6ce9..934d948bec 100644
--- a/target/linux/at91/patches-5.10/132-dmaengine-at_xdmac-adapt-perid-for-mem2mem-operation.patch
+++ b/target/linux/at91/patches-5.10/132-dmaengine-at_xdmac-adapt-perid-for-mem2mem-operation.patch
@@ -21,7 +21,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
 
 --- a/drivers/dma/at_xdmac.c
 +++ b/drivers/dma/at_xdmac.c
-@@ -866,7 +866,7 @@ at_xdmac_interleaved_queue_desc(struct d
+@@ -868,7 +868,7 @@ at_xdmac_interleaved_queue_desc(struct d
  	 * match the one of another channel. If not, it could lead to spurious
  	 * flag status.
  	 */
@@ -30,7 +30,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  					| AT_XDMAC_CC_DIF(0)
  					| AT_XDMAC_CC_SIF(0)
  					| AT_XDMAC_CC_MBSIZE_SIXTEEN
-@@ -1048,7 +1048,7 @@ at_xdmac_prep_dma_memcpy(struct dma_chan
+@@ -1053,7 +1053,7 @@ at_xdmac_prep_dma_memcpy(struct dma_chan
  	 * match the one of another channel. If not, it could lead to spurious
  	 * flag status.
  	 */
@@ -39,7 +39,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  					| AT_XDMAC_CC_DAM_INCREMENTED_AM
  					| AT_XDMAC_CC_SAM_INCREMENTED_AM
  					| AT_XDMAC_CC_DIF(0)
-@@ -1154,7 +1154,7 @@ static struct at_xdmac_desc *at_xdmac_me
+@@ -1160,7 +1160,7 @@ static struct at_xdmac_desc *at_xdmac_me
  	 * match the one of another channel. If not, it could lead to spurious
  	 * flag status.
  	 */
diff --git a/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch b/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
index 5b6ecbcfa3..1557105fca 100644
--- a/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
+++ b/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
@@ -171,7 +171,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  		csize = ffs(atchan->sconfig.dst_maxburst) - 1;
  		if (csize < 0) {
  			dev_err(chan2dev(chan), "invalid src maxburst value\n");
-@@ -865,10 +909,12 @@ at_xdmac_interleaved_queue_desc(struct d
+@@ -867,10 +911,12 @@ at_xdmac_interleaved_queue_desc(struct d
  	 * ERRATA: Even if useless for memory transfers, the PERID has to not
  	 * match the one of another channel. If not, it could lead to spurious
  	 * flag status.
@@ -186,7 +186,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  					| AT_XDMAC_CC_MBSIZE_SIXTEEN
  					| AT_XDMAC_CC_TYPE_MEM_TRAN;
  
-@@ -1047,12 +1093,14 @@ at_xdmac_prep_dma_memcpy(struct dma_chan
+@@ -1052,12 +1098,14 @@ at_xdmac_prep_dma_memcpy(struct dma_chan
  	 * ERRATA: Even if useless for memory transfers, the PERID has to not
  	 * match the one of another channel. If not, it could lead to spurious
  	 * flag status.
@@ -203,7 +203,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  					| AT_XDMAC_CC_MBSIZE_SIXTEEN
  					| AT_XDMAC_CC_TYPE_MEM_TRAN;
  	unsigned long		irqflags;
-@@ -1153,12 +1201,14 @@ static struct at_xdmac_desc *at_xdmac_me
+@@ -1159,12 +1207,14 @@ static struct at_xdmac_desc *at_xdmac_me
  	 * ERRATA: Even if useless for memory transfers, the PERID has to not
  	 * match the one of another channel. If not, it could lead to spurious
  	 * flag status.
@@ -220,7 +220,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  					| AT_XDMAC_CC_MBSIZE_SIXTEEN
  					| AT_XDMAC_CC_MEMSET_HW_MODE
  					| AT_XDMAC_CC_TYPE_MEM_TRAN;
-@@ -1437,7 +1487,7 @@ at_xdmac_tx_status(struct dma_chan *chan
+@@ -1443,7 +1493,7 @@ at_xdmac_tx_status(struct dma_chan *chan
  	mask = AT_XDMAC_CC_TYPE | AT_XDMAC_CC_DSYNC;
  	value = AT_XDMAC_CC_TYPE_PER_TRAN | AT_XDMAC_CC_DSYNC_PER2MEM;
  	if ((desc->lld.mbr_cfg & mask) == value) {
@@ -229,7 +229,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  		while (!(at_xdmac_chan_read(atchan, AT_XDMAC_CIS) & AT_XDMAC_CIS_FIS))
  			cpu_relax();
  	}
-@@ -1495,7 +1545,7 @@ at_xdmac_tx_status(struct dma_chan *chan
+@@ -1501,7 +1551,7 @@ at_xdmac_tx_status(struct dma_chan *chan
  	 * FIFO flush ensures that data are really written.
  	 */
  	if ((desc->lld.mbr_cfg & mask) == value) {
@@ -238,7 +238,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  		while (!(at_xdmac_chan_read(atchan, AT_XDMAC_CIS) & AT_XDMAC_CIS_FIS))
  			cpu_relax();
  	}
-@@ -1763,7 +1813,7 @@ static int at_xdmac_device_pause(struct
+@@ -1758,7 +1808,7 @@ static int at_xdmac_device_pause(struct
  		return 0;
  
  	spin_lock_irqsave(&atchan->lock, flags);
@@ -247,7 +247,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  	while (at_xdmac_chan_read(atchan, AT_XDMAC_CC)
  	       & (AT_XDMAC_CC_WRIP | AT_XDMAC_CC_RDIP))
  		cpu_relax();
-@@ -1786,7 +1836,7 @@ static int at_xdmac_device_resume(struct
+@@ -1781,7 +1831,7 @@ static int at_xdmac_device_resume(struct
  		return 0;
  	}
  
@@ -256,7 +256,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  	clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
  	spin_unlock_irqrestore(&atchan->lock, flags);
  
-@@ -1995,6 +2045,10 @@ static int at_xdmac_probe(struct platfor
+@@ -1993,6 +2043,10 @@ static int at_xdmac_probe(struct platfor
  	atxdmac->regs = base;
  	atxdmac->irq = irq;
  
@@ -267,7 +267,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  	atxdmac->clk = devm_clk_get(&pdev->dev, "dma_clk");
  	if (IS_ERR(atxdmac->clk)) {
  		dev_err(&pdev->dev, "can't get dma_clk\n");
-@@ -2137,6 +2191,10 @@ static const struct dev_pm_ops atmel_xdm
+@@ -2135,6 +2189,10 @@ static const struct dev_pm_ops atmel_xdm
  static const struct of_device_id atmel_xdmac_dt_ids[] = {
  	{
  		.compatible = "atmel,sama5d4-dma",
diff --git a/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch b/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
index af0ea2af0d..8dce9c6844 100644
--- a/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
+++ b/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
@@ -71,7 +71,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  };
  
  static inline void __iomem *at_xdmac_chan_reg_base(struct at_xdmac *atxdmac, unsigned int chan_nb)
-@@ -2006,6 +2027,30 @@ static int atmel_xdmac_resume(struct dev
+@@ -2004,6 +2025,30 @@ static int atmel_xdmac_resume(struct dev
  }
  #endif /* CONFIG_PM_SLEEP */
  
@@ -102,7 +102,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  static int at_xdmac_probe(struct platform_device *pdev)
  {
  	struct at_xdmac	*atxdmac;
-@@ -2150,6 +2195,8 @@ static int at_xdmac_probe(struct platfor
+@@ -2148,6 +2193,8 @@ static int at_xdmac_probe(struct platfor
  	dev_info(&pdev->dev, "%d channels, mapped at 0x%p\n",
  		 nr_channels, atxdmac->regs);
  
diff --git a/target/linux/at91/patches-5.10/221-ARM-multi_v7_defconfig-add-sama7g5-SoC.patch b/target/linux/at91/patches-5.10/221-ARM-multi_v7_defconfig-add-sama7g5-SoC.patch
index 6c95d4a0f5..3bf7601f3c 100644
--- a/target/linux/at91/patches-5.10/221-ARM-multi_v7_defconfig-add-sama7g5-SoC.patch
+++ b/target/linux/at91/patches-5.10/221-ARM-multi_v7_defconfig-add-sama7g5-SoC.patch
@@ -23,7 +23,7 @@ Link: https://lore.kernel.org/r/20210628120452.74408-4-eugen.hristev@microchip.c
  CONFIG_ARCH_BCM=y
  CONFIG_ARCH_BCM_CYGNUS=y
  CONFIG_ARCH_BCM_HR2=y
-@@ -967,6 +968,7 @@ CONFIG_APQ_MMCC_8084=y
+@@ -966,6 +967,7 @@ CONFIG_APQ_MMCC_8084=y
  CONFIG_MSM_GCC_8660=y
  CONFIG_MSM_MMCC_8960=y
  CONFIG_MSM_MMCC_8974=y