Linux v5.4.18

1 files changed, 0 insertions, 73 deletions

diff --git a/alsa-5.6.patch b/alsa-5.6.patch
index 181525102..b5436a7b2 100644
--- a/alsa-5.6.patch
+++ b/alsa-5.6.patch
@@ -1,76 +1,3 @@
-From 4ef91c45a5a283dc8899402bc68adfe0aa9a026d Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 4 Dec 2019 15:15:44 -0600
-Subject: [PATCH 1/4] ASoC: intel/skl/hda - export number of digital
- microphones via control components
-
-It is required for the auto-detection in the user space (for UCM).
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Cc: Mark Brown <broonie@kernel.org>
-Link: https://lore.kernel.org/r/20191204211556.12671-2-pierre-louis.bossart@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit 8cd9956f61c65022209ce6d1e55ed12aea12357d)
-Bugzilla: 1772498
----
- sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 ++++++++
- sound/soc/sof/intel/hda.c                    | 3 ++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c
-index 4e45901e3a2f..11eaee9ae41f 100644
---- a/sound/soc/intel/boards/skl_hda_dsp_generic.c
-+++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c
-@@ -100,6 +100,8 @@ static struct snd_soc_card hda_soc_card = {
- 	.late_probe = skl_hda_card_late_probe,
- };
- 
-+static char hda_soc_components[30];
-+
- #define IDISP_DAI_COUNT		3
- #define HDAC_DAI_COUNT		2
- #define DMIC_DAI_COUNT		2
-@@ -183,6 +185,12 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
- 	hda_soc_card.dev = &pdev->dev;
- 	snd_soc_card_set_drvdata(&hda_soc_card, ctx);
- 
-+	if (mach->mach_params.dmic_num > 0) {
-+		snprintf(hda_soc_components, sizeof(hda_soc_components),
-+				"cfg-dmics:%d", mach->mach_params.dmic_num);
-+		hda_soc_card.components = hda_soc_components;
-+	}
-+
- 	return devm_snd_soc_register_card(&pdev->dev, &hda_soc_card);
- }
- 
-diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
-index 91bd88fddac7..eea01f75d23d 100644
---- a/sound/soc/sof/intel/hda.c
-+++ b/sound/soc/sof/intel/hda.c
-@@ -351,7 +351,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
- 	const char *tplg_filename;
- 	const char *idisp_str;
- 	const char *dmic_str;
--	int dmic_num;
-+	int dmic_num = 0;
- 	int codec_num = 0;
- 	int i;
- #endif
-@@ -472,6 +472,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
- 		mach_params->codec_mask = bus->codec_mask;
- 		mach_params->platform = dev_name(sdev->dev);
- 		mach_params->common_hdmi_codec_drv = hda_codec_use_common_hdmi;
-+		mach_params->dmic_num = dmic_num;
- 	}
- 
- 	/* create codec instances */
--- 
-2.20.1
-
-
 From 89be5f69889f7e9aeab05279869bba3e9e0d2002 Mon Sep 17 00:00:00 2001
 From: Jaroslav Kysela <perex@perex.cz>
 Date: Wed, 4 Dec 2019 15:15:45 -0600