kernel: bump 5.4 to 5.4.59

Removed since added upstream:
  bcm27xx:
    950-0428-staging-vchiq_arm-Add-a-matching-unregister-call.patch
  lantiq:
    0800-spi-lantiq-ssc-Fix-warning-by-using-WQ_MEM_RECLAI.patch

Manually adjusted patches:
  layerscape:
    801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch

Build-tested: ath79/generic, ramips, lantiq/xrx200, lantiq/xway,
   mvebu/cortexa9, sunxi/a53
Run-tested: ipq806x (R7800), layerscape (LS1012A-FRDM, LS1046A-RDB)

Building on layerscape is only possible with workaround from PR #3179.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-By: John Audia <graysky@archlinux.us> [ipq806x]
Tested-by: Pawel Dembicki <paweldembicki@gmail.com> [layerscape]

5 files changed, 22 insertions, 23 deletions

diff --git a/target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch b/target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch
index 3b5acba46e..a1ac7af5c3 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch
@@ -56,7 +56,7 @@ Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
  
  static void enable_rams_ecc(struct fman_fpm_regs __iomem *fpm_rg)
  {
-@@ -1919,7 +1941,10 @@ _return:
+@@ -1918,7 +1940,10 @@ _return:
  static int fman_init(struct fman *fman)
  {
  	struct fman_cfg *cfg = NULL;
@@ -68,7 +68,7 @@ Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
  
  	if (is_init_done(fman->cfg))
  		return -EINVAL;
-@@ -1939,6 +1964,7 @@ static int fman_init(struct fman *fman)
+@@ -1938,6 +1963,7 @@ static int fman_init(struct fman *fman)
  	memset_io((void __iomem *)(fman->base_addr + CGP_OFFSET), 0,
  		  fman->state->fm_port_num_of_cg);
  
@@ -76,7 +76,7 @@ Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
  	/* Save LIODN info before FMan reset
  	 * Skipping non-existent port 0 (i = 1)
  	 */
-@@ -1958,6 +1984,9 @@ static int fman_init(struct fman *fman)
+@@ -1957,6 +1983,9 @@ static int fman_init(struct fman *fman)
  		}
  		fman->liodn_base[i] = liodn_base;
  	}
@@ -86,7 +86,7 @@ Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
  
  	err = fman_reset(fman);
  	if (err)
-@@ -2186,8 +2215,12 @@ int fman_set_port_params(struct fman *fm
+@@ -2185,8 +2214,12 @@ int fman_set_port_params(struct fman *fm
  	if (err)
  		goto return_err;
  
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch b/target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch
index e88d0fb39f..5b51fa2794 100644
--- a/target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch
+++ b/target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch
@@ -28,7 +28,7 @@ This reverts commit e75f4940e8ad0dd76527302a10c06b58bf7eb590.
  	ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
  			SNDRV_PCM_HW_PARAM_RATE, &fsl_sai_rate_constraints);
  
-@@ -1048,35 +1038,30 @@ static int fsl_sai_remove(struct platfor
+@@ -1049,35 +1039,30 @@ static int fsl_sai_remove(struct platfor
  
  static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
  	.use_imx_pcm = false,
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch b/target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch
index ba3eb4dc30..08198f2c40 100644
--- a/target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch
+++ b/target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch
@@ -10,7 +10,7 @@ This reverts commit 6eeb60be5ebb73b2e5911e26fb1aed02940b7d09.
 
 --- a/sound/soc/fsl/fsl_sai.c
 +++ b/sound/soc/fsl/fsl_sai.c
-@@ -1043,19 +1043,12 @@ static const struct fsl_sai_soc_data fsl
+@@ -1044,19 +1044,12 @@ static const struct fsl_sai_soc_data fsl
  	.reg_offset = 8,
  };
  
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch b/target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch
index 4735ccee01..d3518b277f 100644
--- a/target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch
+++ b/target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch
@@ -10,7 +10,7 @@ This reverts commit a860fac420971c5a90d4f78959b44ead793aee4f.
 
 --- a/sound/soc/fsl/fsl_sai.c
 +++ b/sound/soc/fsl/fsl_sai.c
-@@ -1031,24 +1031,10 @@ static const struct fsl_sai_soc_data fsl
+@@ -1032,24 +1032,10 @@ static const struct fsl_sai_soc_data fsl
  	.reg_offset = 0,
  };
  
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch b/target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
index 85dec5cd2e..bf5ee60245 100644
--- a/target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
+++ b/target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
@@ -287,7 +287,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  			   FSL_SAI_CR3_TRCE_MASK, 0);
  }
  
-@@ -643,20 +633,18 @@ static const struct snd_soc_dai_ops fsl_
+@@ -643,20 +633,17 @@ static const struct snd_soc_dai_ops fsl_
  static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai)
  {
  	struct fsl_sai *sai = dev_get_drvdata(cpu_dai->dev);
@@ -305,17 +305,16 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
 +	regmap_write(sai->regmap, FSL_SAI_RCSR, 0);
  
 -	regmap_update_bits(sai->regmap, FSL_SAI_TCR1(ofs),
--			   FSL_SAI_CR1_RFW_MASK,
+-			   FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth),
 +	regmap_update_bits(sai->regmap, FSL_SAI_TCR1, FSL_SAI_CR1_RFW_MASK,
  			   sai->soc_data->fifo_depth - FSL_SAI_MAXBURST_TX);
 -	regmap_update_bits(sai->regmap, FSL_SAI_RCR1(ofs),
--			   FSL_SAI_CR1_RFW_MASK, FSL_SAI_MAXBURST_RX - 1);
+-			   FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth),
 +	regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK,
-+			   FSL_SAI_MAXBURST_RX - 1);
+ 			   FSL_SAI_MAXBURST_RX - 1);
  
  	snd_soc_dai_init_dma_data(cpu_dai, &sai->dma_params_tx,
- 				&sai->dma_params_rx);
-@@ -693,12 +681,12 @@ static const struct snd_soc_component_dr
+@@ -694,12 +681,12 @@ static const struct snd_soc_component_dr
  	.name           = "fsl-sai",
  };
  
@@ -334,7 +333,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	{FSL_SAI_TDR0, 0},
  	{FSL_SAI_TDR1, 0},
  	{FSL_SAI_TDR2, 0},
-@@ -707,50 +695,24 @@ static struct reg_default fsl_sai_reg_de
+@@ -708,50 +695,24 @@ static struct reg_default fsl_sai_reg_de
  	{FSL_SAI_TDR5, 0},
  	{FSL_SAI_TDR6, 0},
  	{FSL_SAI_TDR7, 0},
@@ -398,7 +397,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	case FSL_SAI_TFR0:
  	case FSL_SAI_TFR1:
  	case FSL_SAI_TFR2:
-@@ -760,6 +722,12 @@ static bool fsl_sai_readable_reg(struct
+@@ -761,6 +722,12 @@ static bool fsl_sai_readable_reg(struct
  	case FSL_SAI_TFR6:
  	case FSL_SAI_TFR7:
  	case FSL_SAI_TMR:
@@ -411,7 +410,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	case FSL_SAI_RDR0:
  	case FSL_SAI_RDR1:
  	case FSL_SAI_RDR2:
-@@ -785,13 +753,9 @@ static bool fsl_sai_readable_reg(struct
+@@ -786,13 +753,9 @@ static bool fsl_sai_readable_reg(struct
  
  static bool fsl_sai_volatile_reg(struct device *dev, unsigned int reg)
  {
@@ -427,7 +426,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	case FSL_SAI_TFR0:
  	case FSL_SAI_TFR1:
  	case FSL_SAI_TFR2:
-@@ -824,16 +788,13 @@ static bool fsl_sai_volatile_reg(struct
+@@ -825,16 +788,13 @@ static bool fsl_sai_volatile_reg(struct
  
  static bool fsl_sai_writeable_reg(struct device *dev, unsigned int reg)
  {
@@ -450,7 +449,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	case FSL_SAI_TDR0:
  	case FSL_SAI_TDR1:
  	case FSL_SAI_TDR2:
-@@ -843,6 +804,12 @@ static bool fsl_sai_writeable_reg(struct
+@@ -844,6 +804,12 @@ static bool fsl_sai_writeable_reg(struct
  	case FSL_SAI_TDR6:
  	case FSL_SAI_TDR7:
  	case FSL_SAI_TMR:
@@ -463,7 +462,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	case FSL_SAI_RMR:
  		return true;
  	default:
-@@ -850,15 +817,15 @@ static bool fsl_sai_writeable_reg(struct
+@@ -851,15 +817,15 @@ static bool fsl_sai_writeable_reg(struct
  	}
  }
  
@@ -482,7 +481,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	.readable_reg = fsl_sai_readable_reg,
  	.volatile_reg = fsl_sai_volatile_reg,
  	.writeable_reg = fsl_sai_writeable_reg,
-@@ -890,12 +857,6 @@ static int fsl_sai_probe(struct platform
+@@ -891,12 +857,6 @@ static int fsl_sai_probe(struct platform
  	if (IS_ERR(base))
  		return PTR_ERR(base);
  
@@ -495,7 +494,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev,
  			"bus", base, &fsl_sai_regmap_config);
  
-@@ -1022,13 +983,11 @@ static int fsl_sai_remove(struct platfor
+@@ -1023,13 +983,11 @@ static int fsl_sai_remove(struct platfor
  static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
  	.use_imx_pcm = false,
  	.fifo_depth = 32,
@@ -509,7 +508,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  };
  
  static const struct of_device_id fsl_sai_ids[] = {
-@@ -1061,7 +1020,6 @@ static int fsl_sai_runtime_suspend(struc
+@@ -1062,7 +1020,6 @@ static int fsl_sai_runtime_suspend(struc
  static int fsl_sai_runtime_resume(struct device *dev)
  {
  	struct fsl_sai *sai = dev_get_drvdata(dev);
@@ -517,7 +516,7 @@ This reverts commit 4f7a0728b5305e2d865f543fbcffd617e03c7674.
  	int ret;
  
  	ret = clk_prepare_enable(sai->bus_clk);
-@@ -1083,11 +1041,11 @@ static int fsl_sai_runtime_resume(struct
+@@ -1084,11 +1041,11 @@ static int fsl_sai_runtime_resume(struct
  	}
  
  	regcache_cache_only(sai->regmap, false);