From 802ddf0f8d07021f7ed09954e308ee225f19d0de Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 16 Jan 2024 13:24:29 -0500 Subject: [PATCH] Drop asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch Signed-off-by: Sasha Levin --- ...k-mt8186-add-google-steelix-topology.patch | 37 ------------------- queue-6.1/series | 1 - ...k-mt8186-add-google-steelix-topology.patch | 37 ------------------- queue-6.6/series | 1 - 4 files changed, 76 deletions(-) delete mode 100644 queue-6.1/asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch delete mode 100644 queue-6.6/asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch diff --git a/queue-6.1/asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch b/queue-6.1/asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch deleted file mode 100644 index e64fc472cf5..00000000000 --- a/queue-6.1/asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 152629176282853223e1768c312539ee0d847384 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Nov 2023 09:44:54 +0100 -Subject: ASoC: SOF: mediatek: mt8186: Add Google Steelix topology compatible - -From: AngeloGioacchino Del Regno - -[ Upstream commit 505c83212da5bfca95109421b8f5d9f8c6cdfef2 ] - -Add the machine compatible and topology filename for the Google Steelix -MT8186 Chromebook to load the correct SOF topology file. - -Signed-off-by: AngeloGioacchino Del Regno -Link: https://lore.kernel.org/r/20231123084454.20471-1-angelogioacchino.delregno@collabora.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/sof/mediatek/mt8186/mt8186.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c -index 181189e00e02..76ce90e1f103 100644 ---- a/sound/soc/sof/mediatek/mt8186/mt8186.c -+++ b/sound/soc/sof/mediatek/mt8186/mt8186.c -@@ -596,6 +596,9 @@ static struct snd_sof_dsp_ops sof_mt8186_ops = { - - static struct snd_sof_of_mach sof_mt8186_machs[] = { - { -+ .compatible = "google,steelix", -+ .sof_tplg_filename = "sof-mt8186-google-steelix.tplg" -+ }, { - .compatible = "mediatek,mt8186", - .sof_tplg_filename = "sof-mt8186.tplg", - }, --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index bf6161614d1..e160cb8f381 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -24,7 +24,6 @@ asoc-intel-skylake-mem-leak-in-skl-register-function.patch asoc-cs43130-fix-the-position-of-const-qualifier.patch asoc-cs43130-fix-incorrect-frame-delay-configuration.patch asoc-rt5650-add-mutex-to-avoid-the-jack-detection-fa.patch -asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch nouveau-tu102-flush-all-pdbs-on-vmm-flush.patch asoc-amd-yc-add-dmi-entry-to-support-system76-pangol.patch diff --git a/queue-6.6/asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch b/queue-6.6/asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch deleted file mode 100644 index 10a1c86b46a..00000000000 --- a/queue-6.6/asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 89a2397d1a8f976604ede4478f42444ea8465726 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Nov 2023 09:44:54 +0100 -Subject: ASoC: SOF: mediatek: mt8186: Add Google Steelix topology compatible - -From: AngeloGioacchino Del Regno - -[ Upstream commit 505c83212da5bfca95109421b8f5d9f8c6cdfef2 ] - -Add the machine compatible and topology filename for the Google Steelix -MT8186 Chromebook to load the correct SOF topology file. - -Signed-off-by: AngeloGioacchino Del Regno -Link: https://lore.kernel.org/r/20231123084454.20471-1-angelogioacchino.delregno@collabora.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/sof/mediatek/mt8186/mt8186.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c -index f587edf9e0a7..35f5c2cfb6e4 100644 ---- a/sound/soc/sof/mediatek/mt8186/mt8186.c -+++ b/sound/soc/sof/mediatek/mt8186/mt8186.c -@@ -599,6 +599,9 @@ static struct snd_sof_dsp_ops sof_mt8186_ops = { - - static struct snd_sof_of_mach sof_mt8186_machs[] = { - { -+ .compatible = "google,steelix", -+ .sof_tplg_filename = "sof-mt8186-google-steelix.tplg" -+ }, { - .compatible = "mediatek,mt8186", - .sof_tplg_filename = "sof-mt8186.tplg", - }, --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index effaadb0be5..0fe9380cccb 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -37,7 +37,6 @@ asoc-cs43130-fix-the-position-of-const-qualifier.patch asoc-cs43130-fix-incorrect-frame-delay-configuration.patch asoc-fsl_xcvr-enable-2-tx-bit-clock-for-spdif-only-c.patch asoc-rt5650-add-mutex-to-avoid-the-jack-detection-fa.patch -asoc-sof-mediatek-mt8186-add-google-steelix-topology.patch asoc-fsl_xcvr-refine-the-requested-phy-clock-frequen.patch asoc-intel-skl_hda_dsp_generic-drop-hdmi-routes-when.patch asoc-sof-ipc4-topology-add-core_mask-in-struct-snd_s.patch -- 2.47.3