From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 2 May 2020 14:16:11 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.221~2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=79ec64a7c2ab4f63e72fdcf41d187b2582856994;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	revert-asoc-meson-axg-card-fix-codec-to-codec-link-setup.patch
---

diff --git a/queue-5.4/revert-asoc-meson-axg-card-fix-codec-to-codec-link-setup.patch b/queue-5.4/revert-asoc-meson-axg-card-fix-codec-to-codec-link-setup.patch
new file mode 100644
index 00000000000..81ae1fc813f
--- /dev/null
+++ b/queue-5.4/revert-asoc-meson-axg-card-fix-codec-to-codec-link-setup.patch
@@ -0,0 +1,36 @@
+From 4eedce3a1e13269457a54b15b57787dac107bcdb Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sat, 2 May 2020 16:10:54 +0200
+Subject: Revert "ASoC: meson: axg-card: fix codec-to-codec link setup"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 005aa9f0af9d600d3c8fa655a4aa48e4ec7c5b9d which is
+commit 1164284270779e1865cc2046a2a01b58a1e858a9 upstream.
+
+It should not have been backported, I only looked at the "Fixes:" tag,
+not the changelog text itself, my fault.
+
+Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com>
+Cc: Jerome Brunet <jbrunet@baylibre.com>
+Cc: Mark Brown <broonie@kernel.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/meson/axg-card.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/sound/soc/meson/axg-card.c
++++ b/sound/soc/meson/axg-card.c
+@@ -586,10 +586,8 @@ static int axg_card_add_link(struct snd_
+ 
+ 	if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node))
+ 		ret = axg_card_parse_tdm(card, np, index);
+-	else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) {
++	else if (axg_card_cpu_is_codec(dai_link->cpus->of_node))
+ 		dai_link->params = &codec_params;
+-		dai_link->no_pcm = 0; /* link is not a DPCM BE */
+-	}
+ 
+ 	return ret;
+ }
diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644
index 00000000000..9cb72574f67
--- /dev/null
+++ b/queue-5.4/series
@@ -0,0 +1 @@
+revert-asoc-meson-axg-card-fix-codec-to-codec-link-setup.patch