Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora

2 files changed, 3 insertions, 249 deletions

diff --git a/alsa-5.5.patch b/alsa-5.5.patch
index 8eb34ff28..e2edd3d9e 100644
--- a/alsa-5.5.patch
+++ b/alsa-5.5.patch
@@ -5582,115 +5582,6 @@ index e2c53a0841da..059242f15d75 100644
 2.20.1
 
 
-From d04677b943723aa40149b14f28e02a51cdf68080 Mon Sep 17 00:00:00 2001
-From: Sam McNally <sammc@chromium.org>
-Date: Tue, 17 Sep 2019 15:49:33 +1000
-Subject: [PATCH 053/130] ASoC: Intel: cht_bsw_rt5645: Add quirk for boards
- using pmc_plt_clk_0
-
-As of commit 648e921888ad ("clk: x86: Stop marking clocks as
-CLK_IS_CRITICAL"), the cht_bsw_rt5645 driver needs to enable the clock
-it's using for the codec's mclk. It does this from commit 7735bce05a9c
-("ASoC: Intel: boards: use devm_clk_get() unconditionally"), enabling
-pmc_plt_clk_3. However, Strago family Chromebooks use pmc_plt_clk_0 for
-the codec mclk, resulting in white noise with some digital microphones.
-Add a DMI-based quirk for Strago family Chromebooks to use pmc_plt_clk_0
-instead - mirroring the changes made to cht_bsw_max98090_ti in
-commit a182ecd3809c ("ASoC: intel: cht_bsw_max98090_ti: Add quirk for
-boards using pmc_plt_clk_0") and making use of the existing
-dmi_check_system() call and related infrastructure added in
-commit 22af29114eb4 ("ASoC: Intel: cht-bsw-rt5645: add quirks for
-SSP0/AIF1/AIF2 routing").
-
-Signed-off-by: Sam McNally <sammc@chromium.org>
-Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20190917054933.209335-1-sammc@chromium.org
-Signed-off-by: Mark Brown <broonie@kernel.org>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit adebb11139029ddf1fba6f796c4a476f17eacddc)
-Bugzilla: 1772498
----
- sound/soc/intel/boards/cht_bsw_rt5645.c | 26 +++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
-index 8879c3be29d5..c68a5b85a4a0 100644
---- a/sound/soc/intel/boards/cht_bsw_rt5645.c
-+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
-@@ -48,6 +48,7 @@ struct cht_mc_private {
- #define CHT_RT5645_SSP2_AIF2     BIT(16) /* default is using AIF1  */
- #define CHT_RT5645_SSP0_AIF1     BIT(17)
- #define CHT_RT5645_SSP0_AIF2     BIT(18)
-+#define CHT_RT5645_PMC_PLT_CLK_0 BIT(19)
- 
- static unsigned long cht_rt5645_quirk = 0;
- 
-@@ -59,6 +60,8 @@ static void log_quirks(struct device *dev)
- 		dev_info(dev, "quirk SSP0_AIF1 enabled");
- 	if (cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2)
- 		dev_info(dev, "quirk SSP0_AIF2 enabled");
-+	if (cht_rt5645_quirk & CHT_RT5645_PMC_PLT_CLK_0)
-+		dev_info(dev, "quirk PMC_PLT_CLK_0 enabled");
- }
- 
- static int platform_clock_control(struct snd_soc_dapm_widget *w,
-@@ -226,15 +229,21 @@ static int cht_aif1_hw_params(struct snd_pcm_substream *substream,
- 	return 0;
- }
- 
--/* uncomment when we have a real quirk
- static int cht_rt5645_quirk_cb(const struct dmi_system_id *id)
- {
- 	cht_rt5645_quirk = (unsigned long)id->driver_data;
- 	return 1;
- }
--*/
- 
- static const struct dmi_system_id cht_rt5645_quirk_table[] = {
-+	{
-+		/* Strago family Chromebooks */
-+		.callback = cht_rt5645_quirk_cb,
-+		.matches = {
-+			DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"),
-+		},
-+		.driver_data = (void *)CHT_RT5645_PMC_PLT_CLK_0,
-+	},
- 	{
- 	},
- };
-@@ -526,6 +535,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
- 	int dai_index = 0;
- 	int ret_val = 0;
- 	int i;
-+	const char *mclk_name;
- 
- 	drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL);
- 	if (!drv)
-@@ -662,11 +672,15 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
- 	if (ret_val)
- 		return ret_val;
- 
--	drv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
-+	if (cht_rt5645_quirk & CHT_RT5645_PMC_PLT_CLK_0)
-+		mclk_name = "pmc_plt_clk_0";
-+	else
-+		mclk_name = "pmc_plt_clk_3";
-+
-+	drv->mclk = devm_clk_get(&pdev->dev, mclk_name);
- 	if (IS_ERR(drv->mclk)) {
--		dev_err(&pdev->dev,
--			"Failed to get MCLK from pmc_plt_clk_3: %ld\n",
--			PTR_ERR(drv->mclk));
-+		dev_err(&pdev->dev, "Failed to get MCLK from %s: %ld\n",
-+			mclk_name, PTR_ERR(drv->mclk));
- 		return PTR_ERR(drv->mclk);
- 	}
- 
--- 
-2.20.1
-
-
 From 83c22d6aef225035385971716098b753ea2d145e Mon Sep 17 00:00:00 2001
 From: Naveen M <naveen.m@intel.com>
 Date: Tue, 15 Oct 2019 00:28:00 +0800
@@ -9939,146 +9830,6 @@ index 2cbd9796a25f..d42924ff13f1 100644
 2.20.1
 
 
-From acab1a3016c11ce7262f08ee5f978ba0fd650d81 Mon Sep 17 00:00:00 2001
-From: Hui Wang <hui.wang@canonical.com>
-Date: Thu, 21 Nov 2019 10:26:43 +0800
-Subject: [PATCH 103/130] ALSA: hda/realtek - Move some alc256 pintbls to
- fallback table
-
-We have a new Dell machine which needs to apply the quirk
-ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, try to use the fallback table
-to fix it this time. And we could remove all pintbls of alc256
-for applying DELL1_MIC_NO_PRESENCE on Dell machines.
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-Link: https://lore.kernel.org/r/20191121022644.8078-1-hui.wang@canonical.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit aed8c7f40882015aad45088256231babcbc24482)
-Bugzilla: 1772498
----
- sound/pci/hda/patch_realtek.c | 35 +++--------------------------------
- 1 file changed, 3 insertions(+), 32 deletions(-)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 80f66ba85f87..4c83ed4b0d5c 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7608,38 +7608,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
- 	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
- 		{0x1b, 0x01011020},
- 		{0x21, 0x02211010}),
--	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0x90a60130},
--		{0x14, 0x90170110},
--		{0x1b, 0x01011020},
--		{0x21, 0x0221101f}),
--	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0x90a60160},
--		{0x14, 0x90170120},
--		{0x21, 0x02211030}),
--	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0x90a60170},
--		{0x14, 0x90170120},
--		{0x21, 0x02211030}),
--	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell Inspiron 5468", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0x90a60180},
--		{0x14, 0x90170120},
--		{0x21, 0x02211030}),
--	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0xb7a60130},
--		{0x14, 0x90170110},
--		{0x21, 0x02211020}),
--	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0x90a60130},
--		{0x14, 0x90170110},
--		{0x14, 0x01011020},
--		{0x21, 0x0221101f}),
--	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		ALC256_STANDARD_PINS),
--	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x14, 0x90170110},
--		{0x1b, 0x01011020},
--		{0x21, 0x0221101f}),
- 	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC256_FIXUP_ASUS_MIC,
- 		{0x14, 0x90170110},
- 		{0x1b, 0x90a70130},
-@@ -7852,6 +7820,9 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = {
- 	SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
- 		{0x19, 0x40000000},
- 		{0x1a, 0x40000000}),
-+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
-+		{0x19, 0x40000000},
-+		{0x1a, 0x40000000}),
- 	{}
- };
- 
--- 
-2.20.1
-
-
-From 0ea4ea7f506846d630b9c31bcc9668c34e6f0555 Mon Sep 17 00:00:00 2001
-From: Hui Wang <hui.wang@canonical.com>
-Date: Thu, 21 Nov 2019 10:26:44 +0800
-Subject: [PATCH 104/130] ALSA: hda/realtek - Move some alc236 pintbls to
- fallback table
-
-We have a new Dell machine which needs to apply the quirk
-ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, try to use the fallback table
-to fix it this time. And we could remove all pintbls of alc236
-for applying DELL1_MIC_NO_PRESENCE on Dell machines.
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-Link: https://lore.kernel.org/r/20191121022644.8078-2-hui.wang@canonical.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit d64ebdbfd4f71406f58210f5ccb16977b4cd31d2)
-Bugzilla: 1772498
----
- sound/pci/hda/patch_realtek.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 4c83ed4b0d5c..4ebe104cb592 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7512,20 +7512,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
- 		{0x19, 0x02a11020},
- 		{0x1a, 0x02a11030},
- 		{0x21, 0x0221101f}),
--	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0x90a60140},
--		{0x14, 0x90170110},
--		{0x21, 0x02211020}),
--	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0x90a60140},
--		{0x14, 0x90170150},
--		{0x21, 0x02211020}),
--	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x21, 0x02211020}),
--	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
--		{0x12, 0x40000000},
--		{0x14, 0x90170110},
--		{0x21, 0x02211020}),
- 	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
- 		{0x14, 0x90170110},
- 		{0x21, 0x02211020}),
-@@ -7823,6 +7809,9 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = {
- 	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
- 		{0x19, 0x40000000},
- 		{0x1a, 0x40000000}),
-+	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
-+		{0x19, 0x40000000},
-+		{0x1a, 0x40000000}),
- 	{}
- };
- 
--- 
-2.20.1
-
-
 From 268e8ce52ad4278f6b94792483d3f8510b435b3e Mon Sep 17 00:00:00 2001
 From: Jens Verwiebe <info@jensverwiebe.de>
 Date: Sun, 24 Nov 2019 13:35:44 +0100
diff --git a/kernel.spec b/kernel.spec
index fec0ee7f0..ffb975932 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2543,6 +2543,9 @@ fi
 #
 #
 %changelog
+* Sat Feb 01 2020 Jeremy Cline <jcline@redhat.com> - 5.4.17-200
+- Linux v5.4.17
+
 * Thu Jan 30 2020 Jeremy Cline <jcline@redhat.com> - 5.4.16-200
 - Linux v5.4.16