From: Greg Kroah-Hartman Date: Wed, 10 Mar 2021 18:25:45 +0000 (+0100) Subject: drop queue-5.10/asoc-intel-sof_rt5682-add-quirk-for-dooly.patch X-Git-Tag: v4.4.261~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f825e60675fc3ce06b0c37fcb8247ee995d7d2ff;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/asoc-intel-sof_rt5682-add-quirk-for-dooly.patch --- diff --git a/queue-5.10/asoc-intel-sof_rt5682-add-quirk-for-dooly.patch b/queue-5.10/asoc-intel-sof_rt5682-add-quirk-for-dooly.patch deleted file mode 100644 index ab65d2dd447..00000000000 --- a/queue-5.10/asoc-intel-sof_rt5682-add-quirk-for-dooly.patch +++ /dev/null @@ -1,55 +0,0 @@ -From dac38ba14891c35af52ceef48995d87aed45ad3c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 31 Oct 2020 01:05:59 +0800 -Subject: ASoC: intel: sof_rt5682: Add quirk for Dooly - -From: Brent Lu - -[ Upstream commit bdd088ce5bfd32b95ab1bd90b49405e7c1f1fff5 ] - -This DMI product family string of this board is "Google_Hatch" so the -DMI quirk will take place. However, this board is using rt1015 speaker -amp instead of max98357a specified in the quirk. Therefore, we need an -new DMI quirk for this board. - -Signed-off-by: Brent Lu -Acked-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20201030170559.20370-3-brent.lu@intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/intel/boards/sof_rt5682.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c -index ddbb9fe7cc06..c6c33910bc35 100644 ---- a/sound/soc/intel/boards/sof_rt5682.c -+++ b/sound/soc/intel/boards/sof_rt5682.c -@@ -99,6 +99,24 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { - SOF_RT5682_MCLK_24MHZ | - SOF_RT5682_SSP_CODEC(1)), - }, -+ { -+ /* -+ * Dooly is hatch family but using rt1015 amp so it -+ * requires a quirk before "Google_Hatch". -+ */ -+ .callback = sof_rt5682_quirk_cb, -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "HP"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "Dooly"), -+ }, -+ .driver_data = (void *)(SOF_RT5682_MCLK_EN | -+ SOF_RT5682_MCLK_24MHZ | -+ SOF_RT5682_SSP_CODEC(0) | -+ SOF_SPEAKER_AMP_PRESENT | -+ SOF_RT1015_SPEAKER_AMP_PRESENT | -+ SOF_RT1015_SPEAKER_AMP_100FS | -+ SOF_RT5682_SSP_AMP(1)), -+ }, - { - .callback = sof_rt5682_quirk_cb, - .matches = { --- -2.30.1 - diff --git a/queue-5.10/series b/queue-5.10/series index d8ccdeeca60..946ccbfaaad 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -6,7 +6,6 @@ arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld-13.0.0.patch btrfs-export-and-rename-qgroup_reserve_meta.patch btrfs-don-t-flush-from-btrfs_delayed_inode_reserve_metadata.patch iommu-amd-fix-sleeping-in-atomic-in-increase_address_space.patch -asoc-intel-sof_rt5682-add-quirk-for-dooly.patch bluetooth-btqca-add-valid-le-states-quirk.patch mwifiex-pcie-skip-cancel_work_sync-on-reset-failure-.patch asoc-intel-sof_sdw-add-quirk-for-new-tigerlake-sdca-.patch