From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 28 Feb 2020 07:10:52 +0000 (+0100)
Subject: 5.5-stable patches
X-Git-Tag: v4.4.215~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a78cc732c4b80a5f90190c2c65d4ce608526e90d;p=thirdparty%2Fkernel%2Fstable-queue.git

5.5-stable patches

added patches:
	asoc-sof-intel-hda-add-idisp4-dai.patch
---

diff --git a/queue-5.5/asoc-sof-intel-hda-add-idisp4-dai.patch b/queue-5.5/asoc-sof-intel-hda-add-idisp4-dai.patch
new file mode 100644
index 00000000000..f946eea1309
--- /dev/null
+++ b/queue-5.5/asoc-sof-intel-hda-add-idisp4-dai.patch
@@ -0,0 +1,40 @@
+From e68d6696575e1af3f92125e842f2853708f34589 Mon Sep 17 00:00:00 2001
+From: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
+Date: Fri, 20 Dec 2019 11:10:36 -0600
+Subject: ASoC: SOF: Intel: hda: Add iDisp4 DAI
+
+From: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
+
+commit e68d6696575e1af3f92125e842f2853708f34589 upstream.
+
+TGL supports more than three iDisp DAI's.
+Add support for iDisp4 CPU DAI.
+
+Without this patch, we saw the below error on our TGL DUT:
+   sof_rt5682 tgl_max98357a_rt5682: ASoC: CPU DAI iDisp4 Pin not registered
+
+Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
+Signed-off-by: Jairaj Arava <jairaj.arava@intel.com>
+Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Link: https://lore.kernel.org/r/20191220171037.10689-2-pierre-louis.bossart@linux.intel.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/sof/intel/hda-dai.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sound/soc/sof/intel/hda-dai.c
++++ b/sound/soc/sof/intel/hda-dai.c
+@@ -444,6 +444,10 @@ struct snd_soc_dai_driver skl_dai[] = {
+ 	.ops = &hda_link_dai_ops,
+ },
+ {
++	.name = "iDisp4 Pin",
++	.ops = &hda_link_dai_ops,
++},
++{
+ 	.name = "Analog CPU DAI",
+ 	.ops = &hda_link_dai_ops,
+ },
diff --git a/queue-5.5/series b/queue-5.5/series
index 4c38e9e087d..02f4ea16118 100644
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -148,3 +148,4 @@ net-mlx5e-fix-crash-in-recovery-flow-without-devlink-reporter.patch
 s390-kaslr-fix-casts-in-get_random.patch
 s390-mm-explicitly-compare-page_default_key-against-zero-in-storage_key_init_range.patch
 bpf-selftests-build-error-in-sockmap_basic.c.patch
+asoc-sof-intel-hda-add-idisp4-dai.patch