From 963310296752863539a3c6c6b0fec54cdca5bcb4 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 4 Dec 2023 14:50:56 -0500 Subject: [PATCH] Drop asoc-intel-move-soc_intel_is_foo-helpers-to-a-generi.patch-4193 Signed-off-by: Sasha Levin --- ...ntel_is_foo-helpers-to-a-generi.patch-4193 | 176 ------------------ queue-5.15/series | 1 - 2 files changed, 177 deletions(-) delete mode 100644 queue-5.15/asoc-intel-move-soc_intel_is_foo-helpers-to-a-generi.patch-4193 diff --git a/queue-5.15/asoc-intel-move-soc_intel_is_foo-helpers-to-a-generi.patch-4193 b/queue-5.15/asoc-intel-move-soc_intel_is_foo-helpers-to-a-generi.patch-4193 deleted file mode 100644 index 74a78d190ed..00000000000 --- a/queue-5.15/asoc-intel-move-soc_intel_is_foo-helpers-to-a-generi.patch-4193 +++ /dev/null @@ -1,176 +0,0 @@ -From 2923cbf8428120e8752ecf0982e36e8e17f0bd01 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 18 Oct 2021 16:33:22 +0200 -Subject: ASoC: Intel: Move soc_intel_is_foo() helpers to a generic header - -From: Hans de Goede - -[ Upstream commit cd45c9bf8b43cd387e167cf166ae5c517f56d658 ] - -The soc_intel_is_foo() helpers from -sound/soc/intel/common/soc-intel-quirks.h are useful outside of the -sound subsystem too. - -Move these to include/linux/platform_data/x86/soc.h, so that -other code can use them too. - -Suggested-by: Andy Shevchenko -Reviewed-by: Andy Shevchenko -Acked-by: Mark Brown -Signed-off-by: Hans de Goede -Link: https://lore.kernel.org/r/20211018143324.296961-2-hdegoede@redhat.com -Stable-dep-of: 7dd692217b86 ("ASoC: SOF: sof-pci-dev: Fix community key quirk detection") -Signed-off-by: Sasha Levin ---- - include/linux/platform_data/x86/soc.h | 65 +++++++++++++++++++++++ - sound/soc/intel/common/soc-intel-quirks.h | 51 ++---------------- - 2 files changed, 68 insertions(+), 48 deletions(-) - create mode 100644 include/linux/platform_data/x86/soc.h - -diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h -new file mode 100644 -index 0000000000000..da05f425587a0 ---- /dev/null -+++ b/include/linux/platform_data/x86/soc.h -@@ -0,0 +1,65 @@ -+/* SPDX-License-Identifier: GPL-2.0-only */ -+/* -+ * Helpers for Intel SoC model detection -+ * -+ * Copyright (c) 2019, Intel Corporation. -+ */ -+ -+#ifndef __PLATFORM_DATA_X86_SOC_H -+#define __PLATFORM_DATA_X86_SOC_H -+ -+#if IS_ENABLED(CONFIG_X86) -+ -+#include -+#include -+ -+#define SOC_INTEL_IS_CPU(soc, type) \ -+static inline bool soc_intel_is_##soc(void) \ -+{ \ -+ static const struct x86_cpu_id soc##_cpu_ids[] = { \ -+ X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ -+ {} \ -+ }; \ -+ const struct x86_cpu_id *id; \ -+ \ -+ id = x86_match_cpu(soc##_cpu_ids); \ -+ if (id) \ -+ return true; \ -+ return false; \ -+} -+ -+SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); -+SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); -+SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); -+SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); -+SOC_INTEL_IS_CPU(cml, KABYLAKE_L); -+ -+#else /* IS_ENABLED(CONFIG_X86) */ -+ -+static inline bool soc_intel_is_byt(void) -+{ -+ return false; -+} -+ -+static inline bool soc_intel_is_cht(void) -+{ -+ return false; -+} -+ -+static inline bool soc_intel_is_apl(void) -+{ -+ return false; -+} -+ -+static inline bool soc_intel_is_glk(void) -+{ -+ return false; -+} -+ -+static inline bool soc_intel_is_cml(void) -+{ -+ return false; -+} -+#endif /* IS_ENABLED(CONFIG_X86) */ -+ -+#endif /* __PLATFORM_DATA_X86_SOC_H */ -diff --git a/sound/soc/intel/common/soc-intel-quirks.h b/sound/soc/intel/common/soc-intel-quirks.h -index a93987ab7f4d7..de4e550c5b34d 100644 ---- a/sound/soc/intel/common/soc-intel-quirks.h -+++ b/sound/soc/intel/common/soc-intel-quirks.h -@@ -9,34 +9,13 @@ - #ifndef _SND_SOC_INTEL_QUIRKS_H - #define _SND_SOC_INTEL_QUIRKS_H - -+#include -+ - #if IS_ENABLED(CONFIG_X86) - - #include --#include --#include - #include - --#define SOC_INTEL_IS_CPU(soc, type) \ --static inline bool soc_intel_is_##soc(void) \ --{ \ -- static const struct x86_cpu_id soc##_cpu_ids[] = { \ -- X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ -- {} \ -- }; \ -- const struct x86_cpu_id *id; \ -- \ -- id = x86_match_cpu(soc##_cpu_ids); \ -- if (id) \ -- return true; \ -- return false; \ --} -- --SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); --SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); --SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); --SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); --SOC_INTEL_IS_CPU(cml, KABYLAKE_L); -- - static inline bool soc_intel_is_byt_cr(struct platform_device *pdev) - { - /* -@@ -114,30 +93,6 @@ static inline bool soc_intel_is_byt_cr(struct platform_device *pdev) - return false; - } - --static inline bool soc_intel_is_byt(void) --{ -- return false; --} -- --static inline bool soc_intel_is_cht(void) --{ -- return false; --} -- --static inline bool soc_intel_is_apl(void) --{ -- return false; --} -- --static inline bool soc_intel_is_glk(void) --{ -- return false; --} -- --static inline bool soc_intel_is_cml(void) --{ -- return false; --} - #endif - -- #endif /* _SND_SOC_INTEL_QUIRKS_H */ -+#endif /* _SND_SOC_INTEL_QUIRKS_H */ --- -2.42.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 879495ef4a3..c39810aece3 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -62,7 +62,6 @@ cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch smb3-fix-touch-h-of-symlink.patch-27885 -asoc-intel-move-soc_intel_is_foo-helpers-to-a-generi.patch-4193 asoc-sof-sof-pci-dev-use-community-key-on-all-up-boa.patch-6898 asoc-sof-sof-pci-dev-add-parameter-to-override-topol.patch-4431 asoc-sof-sof-pci-dev-don-t-use-the-community-key-on-.patch-15789 -- 2.47.3