diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-28 17:51:44 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-28 17:51:44 +0100 |
| commit | 8153b4c2cd1d872c59e50e2ebca702bc2b93fa74 (patch) | |
| tree | ef1b8ecb425c6f7b6466b04fa6b9df9d431e9d0e | |
| parent | 42ea0927e935c6f6d5b0f5b018b5899ac9dd70cb (diff) | |
| parent | d223c3fdcfa08cfb7bdbd60c94d6cbf8e900bf3f (diff) | |
| download | kernel-8153b4c2cd1d872c59e50e2ebca702bc2b93fa74.tar.gz kernel-8153b4c2cd1d872c59e50e2ebca702bc2b93fa74.tar.xz kernel-8153b4c2cd1d872c59e50e2ebca702bc2b93fa74.zip | |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
| -rw-r--r-- | 0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch | 38 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 44 insertions, 0 deletions
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 000000000..e15ad5d75 --- /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 70b83678e..cdd167a2d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -593,6 +593,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 @@ -1836,6 +1839,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 |