From d223c3fdcfa08cfb7bdbd60c94d6cbf8e900bf3f Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Feb 27 2020 19:23:40 +0000
Subject: Fix 5.5.6 sof_hda regression (rhbz 1772498)


---

diff --git a/0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch b/0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch
new file mode 100644
index 0000000..e15ad5d
--- /dev/null
+++ b/0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch
@@ -0,0 +1,38 @@
+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: [PATCH resend] ASoC: SOF: Intel: hda: Add iDisp4 DAI
+
+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>
+---
+ sound/soc/sof/intel/hda-dai.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
+index 2d9ac0035bd2..638812a41328 100644
+--- a/sound/soc/sof/intel/hda-dai.c
++++ b/sound/soc/sof/intel/hda-dai.c
+@@ -440,6 +440,10 @@ struct snd_soc_dai_driver skl_dai[] = {
+ 	.name = "iDisp3 Pin",
+ 	.ops = &hda_link_dai_ops,
+ },
++{
++	.name = "iDisp4 Pin",
++	.ops = &hda_link_dai_ops,
++},
+ {
+ 	.name = "Analog CPU DAI",
+ 	.ops = &hda_link_dai_ops,
+-- 
+2.25.1
+
diff --git a/kernel.spec b/kernel.spec
index 5042c0d..439e233 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -575,6 +575,9 @@ Patch510: 0001-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.patch
 # rhbz 1800335
 Patch511: v2_20200128_dmoulding_me_com.patch
 
+# Fix 5.5.6 sof_hda regression (rhbz#1772498)
+Patch512: 0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1815,6 +1818,9 @@ fi
 #
 #
 %changelog
+* Thu Feb 27 2020 Hans de Goede <hdegoede@redhat.com>
+- Fix 5.5.6 sof_hda regression (rhbz 1772498)
+
 * Mon Feb 24 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.6-100
 - Linux v5.5.6 rebase