Skip to contentSkip to conversation

ASoC: Intel: Remove skylake driver

PATCH In review Cezary Rojewski 4 participants 20 messages Aug 14, 2024 – Aug 20, 2024

Subsystems (3)
lore
Share & tools
lore

Cezary Rojewski

author maintainer
#0 lore raw

v2 cover ASoC: Intel: Remove skylake driver

A spiritual successor to haswell/baytrail removal series [1].

The avs-driver found in sound/soc/intel/avs is a direct replacement to the existing skylake-driver. It covers all features supported by it and more and aligns with the recommended flows and requirements based on Windows driver equivalent.

The skylake-driver related UAPI has been removed with "ASoC: Drop soc-topology ABI v4 support" [2].

For the official kernel tree the deprecation begun with v6.0. Most skylake-drivers users moved to avs- or SOF-driver when AudioDSP capabilities are available on the platform or to snd-hda-intel (sound/pci/hda) when such capabilities are not.

For the supported trees the deprecation begun with v5.4 with v5.15 being the first where the skylake-driver is disabled entirely.

All machine board drivers that consume this DSP driver have their replacements present within sound/soc/intel/avs/boards/ directory.

Changes in v2:
- added two new patches (leading the series)
- the first moves all device entries previously under the skylake-driver dependency under the avs-driver
- the second patch drops struct skl_machine_pdata usage to fix compilation errors as pointed out by IKP
- no further changes, retained Acked-by tags for these

[1]: https://lore.kernel.org/alsa-devel/[email protected]/
[2]: https://lore.kernel.org/alsa-devel/[email protected]/

Cezary Rojewski (14):
ALSA: hda: Move SST device entries to AVS
ASoC: Intel: Drop skl_machine_pdata usage
ASoC: Intel: Remove bxt_rt298 board driver
ASoC: Intel: Remove bxt_da7219_max98357a board driver
ASoC: Intel: Remove kbl_rt5663_rt5514_max98927 board driver
ASoC: Intel: Remove kbl_rt5663_max98927 board driver
ASoC: Intel: Remove kbl_rt5660 board driver
ASoC: Intel: Remove kbl_da7219_max98927 board driver
ASoC: Intel: Remove kbl_da7219_max98357a board driver
ASoC: Intel: Remove skl_rt286 board driver
ASoC: Intel: Remove skl_nau88l25_ssm4567 board driver
ASoC: Intel: Remove skl_nau88l25_max98357a board driver
ASoC: Intel: Remove skylake driver
ASoC: Intel: avs: Enable by default for all SST configurations

 sound/hda/intel-dsp-config.c                  |  111 +-
 sound/soc/intel/Kconfig                       |  120 -
 sound/soc/intel/Makefile                      |    1 -
 sound/soc/intel/avs/core.c                    |    8 +-
 sound/soc/intel/boards/Kconfig                |  152 +-
 sound/soc/intel/boards/Makefile               |   20 -
 sound/soc/intel/boards/bxt_da7219_max98357a.c |  720 ----
 sound/soc/intel/boards/bxt_rt298.c            |  670 ---
 sound/soc/intel/boards/kbl_da7219_max98357a.c |  688 ----
 sound/soc/intel/boards/kbl_da7219_max98927.c  | 1175 ------
 sound/soc/intel/boards/kbl_rt5660.c           |  567 ---
 sound/soc/intel/boards/kbl_rt5663_max98927.c  | 1073 -----
 .../intel/boards/kbl_rt5663_rt5514_max98927.c |  869 ----
 .../soc/intel/boards/skl_nau88l25_max98357a.c |  704 ----
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c |  751 ----
 sound/soc/intel/boards/skl_rt286.c            |  568 ---
 .../intel/common/soc-acpi-intel-cnl-match.c   |    6 -
 .../intel/common/soc-acpi-intel-ehl-match.c   |    1 -
 .../intel/common/soc-acpi-intel-hda-match.c   |    6 -
 .../intel/common/soc-acpi-intel-icl-match.c   |    6 -
 .../intel/common/soc-acpi-intel-kbl-match.c   |   11 -
 .../intel/common/soc-acpi-intel-skl-match.c   |    5 -
 sound/soc/intel/skylake/Makefile              |   15 -
 sound/soc/intel/skylake/bxt-sst.c             |  629 ---
 sound/soc/intel/skylake/cnl-sst-dsp.c         |  266 --
 sound/soc/intel/skylake/cnl-sst-dsp.h         |  103 -
 sound/soc/intel/skylake/cnl-sst.c             |  508 ---
 sound/soc/intel/skylake/skl-debug.c           |  248 --
 sound/soc/intel/skylake/skl-i2s.h             |   87 -
 sound/soc/intel/skylake/skl-messages.c        | 1419 -------
 sound/soc/intel/skylake/skl-nhlt.c            |  269 --
 sound/soc/intel/skylake/skl-pcm.c             | 1507 -------
 sound/soc/intel/skylake/skl-ssp-clk.c         |  428 --
 sound/soc/intel/skylake/skl-ssp-clk.h         |  108 -
 sound/soc/intel/skylake/skl-sst-cldma.c       |  373 --
 sound/soc/intel/skylake/skl-sst-cldma.h       |  243 --
 sound/soc/intel/skylake/skl-sst-dsp.c         |  462 ---
 sound/soc/intel/skylake/skl-sst-dsp.h         |  256 --
 sound/soc/intel/skylake/skl-sst-ipc.c         | 1071 -----
 sound/soc/intel/skylake/skl-sst-ipc.h         |  169 -
 sound/soc/intel/skylake/skl-sst-utils.c       |  425 --
 sound/soc/intel/skylake/skl-sst.c             |  599 ---
 sound/soc/intel/skylake/skl-topology.c        | 3605 -----------------
 sound/soc/intel/skylake/skl-topology.h        |  524 ---
 sound/soc/intel/skylake/skl.c                 | 1177 ------
 sound/soc/intel/skylake/skl.h                 |  207 -
 46 files changed, 59 insertions(+), 22871 deletions(-)
 delete mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c
 delete mode 100644 sound/soc/intel/boards/bxt_rt298.c
 delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98357a.c
 delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98927.c
 delete mode 100644 sound/soc/intel/boards/kbl_rt5660.c
 delete mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c
 delete mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
 delete mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.c
 delete mode 100644 sound/soc/intel/boards/skl_nau88l25_ssm4567.c
 delete mode 100644 sound/soc/intel/boards/skl_rt286.c
 delete mode 100644 sound/soc/intel/skylake/Makefile
 delete mode 100644 sound/soc/intel/skylake/bxt-sst.c
 delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.c
 delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.h
 delete mode 100644 sound/soc/intel/skylake/cnl-sst.c
 delete mode 100644 sound/soc/intel/skylake/skl-debug.c
 delete mode 100644 sound/soc/intel/skylake/skl-i2s.h
 delete mode 100644 sound/soc/intel/skylake/skl-messages.c
 delete mode 100644 sound/soc/intel/skylake/skl-nhlt.c
 delete mode 100644 sound/soc/intel/skylake/skl-pcm.c
 delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c
 delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-utils.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst.c
 delete mode 100644 sound/soc/intel/skylake/skl-topology.c
 delete mode 100644 sound/soc/intel/skylake/skl-topology.h
 delete mode 100644 sound/soc/intel/skylake/skl.c
 delete mode 100644 sound/soc/intel/skylake/skl.h
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH v2 1/14 ALSA: hda: Move SST device entries to AVS

The avs-driver succeeds the skylake-driver. It suppots all configurations of its predecessor and more. Reflect that in the existing selection table.

---
 sound/hda/intel-dsp-config.c | 111 ++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 61 deletions(-)
sound/hda/intel-dsp-config.c +50 -61
index 913880b09065..f018bd779862 100644
@@ -56,10 +56,59 @@ static const struct config_entry config_table[] = {
 	},
 #endif
 /*
- * Apollolake (Broxton-P)
+ * Skylake, Kabylake, Apollolake
  * the legacy HDAudio driver is used except on Up Squared (SOF) and
  * Chromebooks (SST), as well as devices based on the ES8336 codec
  */
+#if IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS)
+	{
+		.flags = FLAG_SST,
+		.device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
+		.dmi_table = (const struct dmi_system_id []) {
+			{
+				.ident = "Google Chromebooks",
+				.matches = {
+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),
+				}
+			},
+			{}
+		}
+	},
+	{
+		.flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
+		.device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
+	},
+	{
+		.flags = FLAG_SST,
+		.device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
+		.dmi_table = (const struct dmi_system_id []) {
+			{
+				.ident = "Google Chromebooks",
+				.matches = {
+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),
+				}
+			},
+			{}
+		}
+	},
+	{
+		.flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
+		.device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
+	},
+	{
+		.flags = FLAG_SST,
+		.device = PCI_DEVICE_ID_INTEL_HDA_APL,
+		.dmi_table = (const struct dmi_system_id []) {
+			{
+				.ident = "Google Chromebooks",
+				.matches = {
+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),
+				}
+			},
+			{}
+		}
+	},
+#endif
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
 	{
 		.flags = FLAG_SOF,
@@ -81,66 +130,6 @@ static const struct config_entry config_table[] = {
 		.codec_hid =  &essx_83x6,
 	},
 #endif
-#if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)
-	{
-		.flags = FLAG_SST,
-		.device = PCI_DEVICE_ID_INTEL_HDA_APL,
-		.dmi_table = (const struct dmi_system_id []) {
-			{
-				.ident = "Google Chromebooks",
-				.matches = {
-					DMI_MATCH(DMI_SYS_VENDOR, "Google"),
-				}
-			},
-			{}
-		}
-	},
-#endif
-/*
- * Skylake and Kabylake use legacy HDAudio driver except for Google
- * Chromebooks (SST)
- */
-
-/* Sunrise Point-LP */
-#if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKL)
-	{
-		.flags = FLAG_SST,
-		.device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
-		.dmi_table = (const struct dmi_system_id []) {
-			{
-				.ident = "Google Chromebooks",
-				.matches = {
-					DMI_MATCH(DMI_SYS_VENDOR, "Google"),
-				}
-			},
-			{}
-		}
-	},
-	{
-		.flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
-		.device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
-	},
-#endif
-/* Kabylake-LP */
-#if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL)
-	{
-		.flags = FLAG_SST,
-		.device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
-		.dmi_table = (const struct dmi_system_id []) {
-			{
-				.ident = "Google Chromebooks",
-				.matches = {
-					DMI_MATCH(DMI_SYS_VENDOR, "Google"),
-				}
-			},
-			{}
-		}
-	},
-	{
-		.flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
-		.device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
-	},
-#endif
 
 /*
  * Geminilake uses legacy HDAudio driver except for Google
Signature · 1 line
2.25.1
maintainer
#2 lore raw

Re: [PATCH v2 01/14] ALSA: hda: Move SST device entries to AVS

Quoted 3 lines · Cezary Rojewski

The avs-driver succeeds the skylake-driver. It suppots all configurations of its predecessor and more. Reflect that in the existing selection table.

Takashi, are you OK with this?

Reviewed-by
#3 lore raw

Re: [PATCH v2 01/14] ALSA: hda: Move SST device entries to AVS

Quoted 7 lines · Mark Brown
Quoted 3 lines · Cezary Rojewski

The avs-driver succeeds the skylake-driver. It suppots all configurations of its predecessor and more. Reflect that in the existing selection table.

Takashi, are you OK with this?

Sorry, I overlooked.

thanks,

Takashi

author maintainer
#4 lore raw

PATCH v2 2/14 ASoC: Intel: Drop skl_machine_pdata usage

In reply to Cezary Rojewski

Preparation step in the skylake-driver removal process.

---
 sound/soc/intel/common/soc-acpi-intel-cnl-match.c |  6 ------
 sound/soc/intel/common/soc-acpi-intel-ehl-match.c |  1 -
 sound/soc/intel/common/soc-acpi-intel-hda-match.c |  6 ------
 sound/soc/intel/common/soc-acpi-intel-icl-match.c |  6 ------
 sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 11 -----------
 sound/soc/intel/common/soc-acpi-intel-skl-match.c |  5 -----
 6 files changed, 35 deletions(-)
sound/soc/intel/common/soc-acpi-intel-cnl-match.c +0 -6
index 3df89e4511da..8bbb1052faf2 100644
@@ -8,7 +8,6 @@
 
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
-#include "../skylake/skl.h"
 #include "soc-acpi-intel-sdw-mockup-match.h"
 
 static const struct snd_soc_acpi_codecs essx_83x6 = {
@@ -16,16 +15,11 @@ static const struct snd_soc_acpi_codecs essx_83x6 = {
 	.codecs = { "ESSX8316", "ESSX8326", "ESSX8336"},
 };
 
-static struct skl_machine_pdata cnl_pdata = {
-	.use_tplg_pcm = true,
-};
-
 struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
 	{
 		.id = "INT34C2",
 		.drv_name = "cnl_rt274",
 		.fw_filename = "intel/dsp_fw_cnl.bin",
-		.pdata = &cnl_pdata,
 		.sof_tplg_filename = "sof-cnl-rt274.tplg",
 	},
 	{
sound/soc/intel/common/soc-acpi-intel-ehl-match.c +0 -1
index 84639c41a268..78255d56b08c 100644
@@ -8,7 +8,6 @@
 
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
-#include "../skylake/skl.h"
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[] = {
 	{
sound/soc/intel/common/soc-acpi-intel-hda-match.c +0 -6
index 2017fd0d676f..007ccd8a60e5 100644
@@ -8,11 +8,6 @@
 
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
-#include "../skylake/skl.h"
-
-static struct skl_machine_pdata hda_pdata = {
-	.use_tplg_pcm = true,
-};
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_hda_machines[] = {
 	{
@@ -28,7 +23,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_hda_machines[] = {
 		 * can be used if we need a more complicated machine driver
 		 * combining HDA+other device (e.g. DMIC).
 		 */
-		.pdata = &hda_pdata,
 	},
 	{},
 };
sound/soc/intel/common/soc-acpi-intel-icl-match.c +0 -6
index 39875d67dcd1..6ce75fbb842e 100644
@@ -8,23 +8,17 @@
 
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
-#include "../skylake/skl.h"
 
 static const struct snd_soc_acpi_codecs essx_83x6 = {
 	.num_codecs = 3,
 	.codecs = { "ESSX8316", "ESSX8326", "ESSX8336"},
 };
 
-static struct skl_machine_pdata icl_pdata = {
-	.use_tplg_pcm = true,
-};
-
 struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = {
 	{
 		.id = "INT34C2",
 		.drv_name = "icl_rt274",
 		.fw_filename = "intel/dsp_fw_icl.bin",
-		.pdata = &icl_pdata,
 		.sof_tplg_filename = "sof-icl-rt274.tplg",
 	},
 	{
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +0 -11
index 4e817f559d38..d4c158d8441b 100644
@@ -8,9 +8,6 @@
 
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
-#include "../skylake/skl.h"
-
-static struct skl_machine_pdata skl_dmic_data;
 
 static const struct snd_soc_acpi_codecs kbl_codecs = {
 	.num_codecs = 1,
@@ -54,7 +51,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_codecs,
-		.pdata = &skl_dmic_data,
 	},
 	{
 		.id = "MX98357A",
@@ -62,7 +58,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_codecs,
-		.pdata = &skl_dmic_data,
 	},
 	{
 		.id = "MX98927",
@@ -70,7 +65,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_5663_5514_codecs,
-		.pdata = &skl_dmic_data,
 	},
 	{
 		.id = "MX98927",
@@ -78,7 +72,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_poppy_codecs,
-		.pdata = &skl_dmic_data,
 	},
 	{
 		.id = "10EC5663",
@@ -91,7 +84,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_7219_98357_codecs,
-		.pdata = &skl_dmic_data,
 	},
 	{
 		.id = "DLGS7219",
@@ -99,7 +91,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_7219_98927_codecs,
-		.pdata = &skl_dmic_data
 	},
 	{
 		.id = "10EC5660",
@@ -117,13 +108,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_7219_98373_codecs,
-		.pdata = &skl_dmic_data
 	},
 	{
 		.id = "MX98373",
 		.drv_name = "kbl_max98373",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
-		.pdata = &skl_dmic_data
 	},
 	{},
 };
sound/soc/intel/common/soc-acpi-intel-skl-match.c +0 -5
index 75302e956742..ee6463202918 100644
@@ -8,9 +8,6 @@
 
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
-#include "../skylake/skl.h"
-
-static struct skl_machine_pdata skl_dmic_data;
 
 static const struct snd_soc_acpi_codecs skl_codecs = {
 	.num_codecs = 1,
@@ -29,7 +26,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_skl_machines[] = {
 		.fw_filename = "intel/dsp_fw_release.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &skl_codecs,
-		.pdata = &skl_dmic_data,
 	},
 	{
 		.id = "MX98357A",
@@ -37,7 +33,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_skl_machines[] = {
 		.fw_filename = "intel/dsp_fw_release.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &skl_codecs,
-		.pdata = &skl_dmic_data,
 	},
 	{},
 };
Signature · 1 line
2.25.1
author maintainer
#5 lore raw

PATCH v2 3/14 ASoC: Intel: Remove bxt_rt298 board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_rt298 (./intel/avs/boards/rt298.c)

---
 sound/soc/intel/boards/Kconfig     |  14 -
 sound/soc/intel/boards/Makefile    |   2 -
 sound/soc/intel/boards/bxt_rt298.c | 670 -----------------------------
 3 files changed, 686 deletions(-)
 delete mode 100644 sound/soc/intel/boards/bxt_rt298.c
sound/soc/intel/boards/Kconfig +0 -14
index 3d59d6982763..0892f2c19ade 100644
@@ -319,20 +319,6 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 	   Say Y or m if you have such a device. This is a recommended option.
 	   If unsure select "N".
 
-config SND_SOC_INTEL_BXT_RT298_MACH
-	tristate "Broxton with RT298 I2S mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_RT298
-	select SND_SOC_DMIC
-	select SND_SOC_HDAC_HDMI
-	select SND_SOC_INTEL_HDA_DSP_COMMON
-	help
-	   This adds support for ASoC machine driver for Broxton platforms
-	   with RT286 I2S audio codec.
-	   Say Y or m if you have such a device. This is a recommended option.
-	   If unsure select "N".
-
 endif ## SND_SOC_INTEL_APL
 
 if SND_SOC_SOF_APOLLOLAKE
sound/soc/intel/boards/Makefile +0 -2
index 5bd8dc2d166a..ae758a8aa61d 100644
@@ -4,7 +4,6 @@ snd-soc-sst-bdw-rt5650-mach-y := bdw-rt5650.o
 snd-soc-sst-bdw-rt5677-mach-y := bdw-rt5677.o
 snd-soc-bdw-rt286-y := bdw_rt286.o
 snd-soc-sst-bxt-da7219_max98357a-y := bxt_da7219_max98357a.o
-snd-soc-sst-bxt-rt298-y := bxt_rt298.o
 snd-soc-sst-sof-pcm512x-y := sof_pcm512x.o
 snd-soc-sst-sof-wm8804-y := sof_wm8804.o
 snd-soc-sst-bytcr-rt5640-y := bytcr_rt5640.o
@@ -43,7 +42,6 @@ obj-$(CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH) += snd-soc-sof_nau8825.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH) += snd-soc-sof_da7219.o
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-hsw-rt5640.o
 obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_max98357a.o
-obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH) += snd-soc-sst-sof-pcm512x.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH) += snd-soc-sst-sof-wm8804.o
 obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-bdw-rt286.o
sound/soc/intel/boards/bxt_rt298.c deleted +0 -670

670 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#6 lore raw

PATCH v2 4/14 ASoC: Intel: Remove bxt_da7219_max98357a board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_da7219 (./intel/avs/boards/da7219.c)
- avs_max98357a (./intel/avs/boards/max98357a.c)

---
 sound/soc/intel/boards/Kconfig                |  16 -
 sound/soc/intel/boards/Makefile               |   2 -
 sound/soc/intel/boards/bxt_da7219_max98357a.c | 720 ------------------
 3 files changed, 738 deletions(-)
 delete mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c
sound/soc/intel/boards/Kconfig +0 -16
index 0892f2c19ade..fb1da74451c1 100644
@@ -305,22 +305,6 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
 	select SND_SOC_HDAC_HDMI
 	select SND_SOC_INTEL_HDA_DSP_COMMON
 
-if SND_SOC_INTEL_APL
-
-config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
-	tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	depends on SND_HDA_CODEC_HDMI
-	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
-	help
-	   This adds support for ASoC machine driver for Broxton-P platforms
-	   with DA7219 + MAX98357A I2S audio codec.
-	   Say Y or m if you have such a device. This is a recommended option.
-	   If unsure select "N".
-
-endif ## SND_SOC_INTEL_APL
-
 if SND_SOC_SOF_APOLLOLAKE
 
 config SND_SOC_INTEL_SOF_WM8804_MACH
sound/soc/intel/boards/Makefile +0 -2
index ae758a8aa61d..a1d53d1eac13 100644
@@ -3,7 +3,6 @@ snd-soc-hsw-rt5640-y := hsw_rt5640.o
 snd-soc-sst-bdw-rt5650-mach-y := bdw-rt5650.o
 snd-soc-sst-bdw-rt5677-mach-y := bdw-rt5677.o
 snd-soc-bdw-rt286-y := bdw_rt286.o
-snd-soc-sst-bxt-da7219_max98357a-y := bxt_da7219_max98357a.o
 snd-soc-sst-sof-pcm512x-y := sof_pcm512x.o
 snd-soc-sst-sof-wm8804-y := sof_wm8804.o
 snd-soc-sst-bytcr-rt5640-y := bytcr_rt5640.o
@@ -41,7 +40,6 @@ obj-$(CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH) += snd-soc-sof_es8336.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH) += snd-soc-sof_nau8825.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH) += snd-soc-sof_da7219.o
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-hsw-rt5640.o
-obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH) += snd-soc-sst-sof-pcm512x.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH) += snd-soc-sst-sof-wm8804.o
 obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-bdw-rt286.o
sound/soc/intel/boards/bxt_da7219_max98357a.c deleted +0 -720

720 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#7 lore raw

PATCH v2 5/14 ASoC: Intel: Remove kbl_rt5663_rt5514_max98927 board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_rt5514 (./intel/avs/boards/rt5514.c)
- avs_rt5663 (./intel/avs/boards/rt5663.c)
- avs_max98927 (./intel/avs/boards/max98927.c)

---
 sound/soc/intel/boards/Kconfig                |  17 -
 sound/soc/intel/boards/Makefile               |   2 -
 .../intel/boards/kbl_rt5663_rt5514_max98927.c | 869 ------------------
 3 files changed, 888 deletions(-)
 delete mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
sound/soc/intel/boards/Kconfig +0 -17
index fb1da74451c1..245a12427132 100644
@@ -338,23 +338,6 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
 	  Say Y or m if you have such a device. This is a recommended option.
 	  If unsure select "N".
 
-config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
-	tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	depends on SPI
-	select SND_SOC_RT5663
-	select SND_SOC_RT5514
-	select SND_SOC_RT5514_SPI
-	select SND_SOC_MAX98927
-	select SND_SOC_HDAC_HDMI
-	select SND_SOC_INTEL_SKYLAKE_SSP_CLK
-	help
-	  This adds support for ASoC Onboard Codec I2S machine driver. This will
-	  create an alsa sound card for RT5663 + RT5514 + MAX98927.
-	  Say Y or m if you have such a device. This is a recommended option.
-	  If unsure select "N".
-
 config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
 	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
sound/soc/intel/boards/Makefile +0 -2
index a1d53d1eac13..dbdb5292c296 100644
@@ -24,7 +24,6 @@ snd-soc-sof_da7219-y := sof_da7219.o
 snd-soc-kbl_da7219_max98357a-y := kbl_da7219_max98357a.o
 snd-soc-kbl_da7219_max98927-y := kbl_da7219_max98927.o
 snd-soc-kbl_rt5663_max98927-y := kbl_rt5663_max98927.o
-snd-soc-kbl_rt5663_rt5514_max98927-y := kbl_rt5663_rt5514_max98927.o
 snd-soc-kbl_rt5660-y := kbl_rt5660.o
 snd-soc-skl_rt286-y := skl_rt286.o
 snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o
@@ -59,7 +58,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.
 obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH) += snd-soc-kbl_da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH) += snd-soc-kbl_da7219_max98927.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH) += snd-soc-kbl_rt5663_max98927.o
-obj-$(CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH) += snd-soc-kbl_rt5663_rt5514_max98927.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH) += snd-soc-kbl_rt5660.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c deleted +0 -869

869 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#8 lore raw

PATCH v2 6/14 ASoC: Intel: Remove kbl_rt5663_max98927 board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_rt5663 (./intel/avs/boards/rt5663.c)
- avs_max98927 (./intel/avs/boards/max98927.c)

---
 sound/soc/intel/boards/Kconfig               |   15 -
 sound/soc/intel/boards/Makefile              |    2 -
 sound/soc/intel/boards/kbl_rt5663_max98927.c | 1073 ------------------
 3 files changed, 1090 deletions(-)
 delete mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c
sound/soc/intel/boards/Kconfig +0 -15
index 245a12427132..842003b4dbe9 100644
@@ -323,21 +323,6 @@ endif ## SND_SOC_SOF_APOLLOLAKE
 
 if SND_SOC_INTEL_KBL
 
-config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
-	tristate "KBL with RT5663 and MAX98927 in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_RT5663
-	select SND_SOC_MAX98927
-	select SND_SOC_DMIC
-	select SND_SOC_HDAC_HDMI
-	select SND_SOC_INTEL_SKYLAKE_SSP_CLK
-	help
-	  This adds support for ASoC Onboard Codec I2S machine driver. This will
-	  create an alsa sound card for RT5663 + MAX98927.
-	  Say Y or m if you have such a device. This is a recommended option.
-	  If unsure select "N".
-
 config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
 	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
sound/soc/intel/boards/Makefile +0 -2
index dbdb5292c296..d4a1ada47b38 100644
@@ -23,7 +23,6 @@ snd-soc-sof_nau8825-y := sof_nau8825.o
 snd-soc-sof_da7219-y := sof_da7219.o
 snd-soc-kbl_da7219_max98357a-y := kbl_da7219_max98357a.o
 snd-soc-kbl_da7219_max98927-y := kbl_da7219_max98927.o
-snd-soc-kbl_rt5663_max98927-y := kbl_rt5663_max98927.o
 snd-soc-kbl_rt5660-y := kbl_rt5660.o
 snd-soc-skl_rt286-y := skl_rt286.o
 snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o
@@ -57,7 +56,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH) += snd-soc-kbl_da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH) += snd-soc-kbl_da7219_max98927.o
-obj-$(CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH) += snd-soc-kbl_rt5663_max98927.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH) += snd-soc-kbl_rt5660.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
sound/soc/intel/boards/kbl_rt5663_max98927.c deleted +0 -1073

1,073 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#9 lore raw

PATCH v2 7/14 ASoC: Intel: Remove kbl_rt5660 board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_rt5660 (./intel/avs/boards/rt5660.c)

---
 sound/soc/intel/boards/Kconfig      |  12 -
 sound/soc/intel/boards/Makefile     |   2 -
 sound/soc/intel/boards/kbl_rt5660.c | 567 ----------------------------
 3 files changed, 581 deletions(-)
 delete mode 100644 sound/soc/intel/boards/kbl_rt5660.c
sound/soc/intel/boards/Kconfig +0 -12
index 842003b4dbe9..5fb9b993ae3f 100644
@@ -348,18 +348,6 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
 	  Say Y if you have such a device.
 	  If unsure select "N".
 
-config SND_SOC_INTEL_KBL_RT5660_MACH
-	tristate "KBL with RT5660 in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	depends on GPIOLIB || COMPILE_TEST
-	select SND_SOC_RT5660
-	select SND_SOC_HDAC_HDMI
-	help
-	  This adds support for ASoC Onboard Codec I2S machine driver. This will
-	  create an alsa sound card for RT5660 I2S audio codec.
-	  Say Y if you have such a device.
-
 endif ## SND_SOC_INTEL_KBL
 
 if SND_SOC_SOF_GEMINILAKE
sound/soc/intel/boards/Makefile +0 -2
index d4a1ada47b38..be1b8cc4028a 100644
@@ -23,7 +23,6 @@ snd-soc-sof_nau8825-y := sof_nau8825.o
 snd-soc-sof_da7219-y := sof_da7219.o
 snd-soc-kbl_da7219_max98357a-y := kbl_da7219_max98357a.o
 snd-soc-kbl_da7219_max98927-y := kbl_da7219_max98927.o
-snd-soc-kbl_rt5660-y := kbl_rt5660.o
 snd-soc-skl_rt286-y := skl_rt286.o
 snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o
 snd-skl_nau88l25_max98357a-y := skl_nau88l25_max98357a.o
@@ -56,7 +55,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH) += snd-soc-kbl_da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH) += snd-soc-kbl_da7219_max98927.o
-obj-$(CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH) += snd-soc-kbl_rt5660.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
sound/soc/intel/boards/kbl_rt5660.c deleted +0 -567

567 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#10 lore raw

PATCH v2 8/14 ASoC: Intel: Remove kbl_da7219_max98927 board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_da7219 (./intel/avs/boards/da7219.c)
- avs_max98927 (./intel/avs/boards/max98927.c)

---
 sound/soc/intel/boards/Kconfig               |   15 -
 sound/soc/intel/boards/Makefile              |    2 -
 sound/soc/intel/boards/kbl_da7219_max98927.c | 1175 ------------------
 3 files changed, 1192 deletions(-)
 delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98927.c
sound/soc/intel/boards/Kconfig +0 -15
index 5fb9b993ae3f..b53678203e3f 100644
@@ -333,21 +333,6 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
 	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec.
 	  Say Y if you have such a device.
 
-config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
-	tristate "KBL with DA7219 and MAX98927 in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_DA7219
-	select SND_SOC_MAX98927
-	select SND_SOC_MAX98373_I2C
-	select SND_SOC_DMIC
-	select SND_SOC_HDAC_HDMI
-	help
-	  This adds support for ASoC Onboard Codec I2S machine driver. This will
-	  create an alsa sound card for DA7219 + MAX98927 I2S audio codec.
-	  Say Y if you have such a device.
-	  If unsure select "N".
-
 endif ## SND_SOC_INTEL_KBL
 
 if SND_SOC_SOF_GEMINILAKE
sound/soc/intel/boards/Makefile +0 -2
index be1b8cc4028a..ff8985783d13 100644
@@ -22,7 +22,6 @@ snd-soc-sof_es8336-y := sof_es8336.o
 snd-soc-sof_nau8825-y := sof_nau8825.o
 snd-soc-sof_da7219-y := sof_da7219.o
 snd-soc-kbl_da7219_max98357a-y := kbl_da7219_max98357a.o
-snd-soc-kbl_da7219_max98927-y := kbl_da7219_max98927.o
 snd-soc-skl_rt286-y := skl_rt286.o
 snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o
 snd-skl_nau88l25_max98357a-y := skl_nau88l25_max98357a.o
@@ -54,7 +53,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
 obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH) += snd-soc-kbl_da7219_max98357a.o
-obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH) += snd-soc-kbl_da7219_max98927.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
sound/soc/intel/boards/kbl_da7219_max98927.c deleted +0 -1175

1,175 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#11 lore raw

PATCH v2 9/14 ASoC: Intel: Remove kbl_da7219_max98357a board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_da7219 (./intel/avs/boards/da7219.c)
- avs_max98357a (./intel/avs/boards/max98357a.c)

---
 sound/soc/intel/boards/Kconfig                |  14 -
 sound/soc/intel/boards/Makefile               |   2 -
 sound/soc/intel/boards/kbl_da7219_max98357a.c | 688 ------------------
 3 files changed, 704 deletions(-)
 delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98357a.c
sound/soc/intel/boards/Kconfig +0 -14
index b53678203e3f..3973f5c351d3 100644
@@ -321,20 +321,6 @@ config SND_SOC_INTEL_SOF_WM8804_MACH
 
 endif ## SND_SOC_SOF_APOLLOLAKE
 
-if SND_SOC_INTEL_KBL
-
-config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
-	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
-	help
-	  This adds support for ASoC Onboard Codec I2S machine driver. This will
-	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec.
-	  Say Y if you have such a device.
-
-endif ## SND_SOC_INTEL_KBL
-
 if SND_SOC_SOF_GEMINILAKE
 
 config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
sound/soc/intel/boards/Makefile +0 -2
index ff8985783d13..37f301a302a4 100644
@@ -21,7 +21,6 @@ snd-soc-sof_cs42l42-y := sof_cs42l42.o
 snd-soc-sof_es8336-y := sof_es8336.o
 snd-soc-sof_nau8825-y := sof_nau8825.o
 snd-soc-sof_da7219-y := sof_da7219.o
-snd-soc-kbl_da7219_max98357a-y := kbl_da7219_max98357a.o
 snd-soc-skl_rt286-y := skl_rt286.o
 snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o
 snd-skl_nau88l25_max98357a-y := skl_nau88l25_max98357a.o
@@ -52,7 +51,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH) += snd-soc-sst-byt-cht-cx2072x.
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
-obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH) += snd-soc-kbl_da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
sound/soc/intel/boards/kbl_da7219_max98357a.c deleted +0 -688

688 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#12 lore raw

PATCH v2 10/14 ASoC: Intel: Remove skl_rt286 board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_rt286 (./intel/avs/boards/rt286.c)

---
 sound/soc/intel/boards/Kconfig     |  13 -
 sound/soc/intel/boards/Makefile    |   2 -
 sound/soc/intel/boards/skl_rt286.c | 568 -----------------------------
 3 files changed, 583 deletions(-)
 delete mode 100644 sound/soc/intel/boards/skl_rt286.c
sound/soc/intel/boards/Kconfig +0 -13
index 3973f5c351d3..03244ec1933f 100644
@@ -254,19 +254,6 @@ endif ## SND_SST_ATOM_HIFI2_PLATFORM
 
 if SND_SOC_INTEL_SKL
 
-config SND_SOC_INTEL_SKL_RT286_MACH
-	tristate "SKL with RT286 I2S mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_RT286
-	select SND_SOC_DMIC
-	select SND_SOC_HDAC_HDMI
-	help
-	   This adds support for ASoC machine driver for Skylake platforms
-	   with RT286 I2S audio codec.
-	   Say Y or m if you have such a device.
-	   If unsure select "N".
-
 config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
 	tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"
 	depends on I2C && ACPI
sound/soc/intel/boards/Makefile +0 -2
index 37f301a302a4..3ef77c99ff09 100644
@@ -21,7 +21,6 @@ snd-soc-sof_cs42l42-y := sof_cs42l42.o
 snd-soc-sof_es8336-y := sof_es8336.o
 snd-soc-sof_nau8825-y := sof_nau8825.o
 snd-soc-sof_da7219-y := sof_da7219.o
-snd-soc-skl_rt286-y := skl_rt286.o
 snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o
 snd-skl_nau88l25_max98357a-y := skl_nau88l25_max98357a.o
 snd-soc-skl_nau88l25_ssm4567-y := skl_nau88l25_ssm4567.o
@@ -51,7 +50,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH) += snd-soc-sst-byt-cht-cx2072x.
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
-obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH) += snd-soc-skl_hda_dsp.o
sound/soc/intel/boards/skl_rt286.c deleted +0 -568

568 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#13 lore raw

PATCH v2 11/14 ASoC: Intel: Remove skl_nau88l25_ssm4567 board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_nau8825 (./intel/avs/boards/nau8825.c)
- avs_ssm4567 (./intel/avs/boards/ssm4567.c)

---
 sound/soc/intel/boards/Kconfig                |  14 -
 sound/soc/intel/boards/Makefile               |   2 -
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 751 ------------------
 3 files changed, 767 deletions(-)
 delete mode 100644 sound/soc/intel/boards/skl_nau88l25_ssm4567.c
sound/soc/intel/boards/Kconfig +0 -14
index 03244ec1933f..243b91501e7f 100644
@@ -254,20 +254,6 @@ endif ## SND_SST_ATOM_HIFI2_PLATFORM
 
 if SND_SOC_INTEL_SKL
 
-config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
-	tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_NAU8825
-	select SND_SOC_SSM4567
-	select SND_SOC_DMIC
-	select SND_SOC_HDAC_HDMI
-	help
-	  This adds support for ASoC Onboard Codec I2S machine driver. This will
-	  create an alsa sound card for NAU88L25 + SSM4567.
-	  Say Y or m if you have such a device. This is a recommended option.
-	  If unsure select "N".
-
 config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
 	tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
sound/soc/intel/boards/Makefile +0 -2
index 3ef77c99ff09..cde3cfae33c1 100644
@@ -23,7 +23,6 @@ snd-soc-sof_nau8825-y := sof_nau8825.o
 snd-soc-sof_da7219-y := sof_da7219.o
 snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o
 snd-skl_nau88l25_max98357a-y := skl_nau88l25_max98357a.o
-snd-soc-skl_nau88l25_ssm4567-y := skl_nau88l25_ssm4567.o
 snd-soc-ehl-rt5660-y := ehl_rt5660.o
 snd-soc-sof-ssp-amp-y := sof_ssp_amp.o
 snd-soc-sof-sdw-y += sof_sdw.o				\
@@ -51,7 +50,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
-obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH) += snd-soc-skl_hda_dsp.o
 obj-$(CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH) += snd-soc-ehl-rt5660.o
 obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH) += snd-soc-sof-sdw.o
sound/soc/intel/boards/skl_nau88l25_ssm4567.c deleted +0 -751

751 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#14 lore raw

PATCH v2 12/14 ASoC: Intel: Remove skl_nau88l25_max98357a board driver

In reply to Cezary Rojewski

The driver has no users.

Succeeded by:
- avs_nau8825 (./intel/avs/boards/nau8825.c)
- avs_max98357a (./intel/avs/boards/max98357a.c)

---
 sound/soc/intel/boards/Kconfig                |  18 -
 sound/soc/intel/boards/Makefile               |   2 -
 .../soc/intel/boards/skl_nau88l25_max98357a.c | 704 ------------------
 3 files changed, 724 deletions(-)
 delete mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.c
sound/soc/intel/boards/Kconfig +0 -18
index 243b91501e7f..ba717e401805 100644
@@ -252,24 +252,6 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
 
 endif ## SND_SST_ATOM_HIFI2_PLATFORM
 
-if SND_SOC_INTEL_SKL
-
-config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
-	tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_NAU8825
-	select SND_SOC_MAX98357A
-	select SND_SOC_DMIC
-	select SND_SOC_HDAC_HDMI
-	help
-	  This adds support for ASoC Onboard Codec I2S machine driver. This will
-	  create an alsa sound card for NAU88L25 + MAX98357A.
-	  Say Y or m if you have such a device. This is a recommended option.
-	  If unsure select "N".
-
-endif ## SND_SOC_INTEL_SKL
-
 config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
 	tristate
 	select SND_SOC_DA7219
sound/soc/intel/boards/Makefile +0 -2
index cde3cfae33c1..9b24de731332 100644
@@ -22,7 +22,6 @@ snd-soc-sof_es8336-y := sof_es8336.o
 snd-soc-sof_nau8825-y := sof_nau8825.o
 snd-soc-sof_da7219-y := sof_da7219.o
 snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o
-snd-skl_nau88l25_max98357a-y := skl_nau88l25_max98357a.o
 snd-soc-ehl-rt5660-y := ehl_rt5660.o
 snd-soc-sof-ssp-amp-y := sof_ssp_amp.o
 snd-soc-sof-sdw-y += sof_sdw.o				\
@@ -49,7 +48,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH) += snd-soc-sst-byt-cht-cx2072x.
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
-obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH) += snd-soc-skl_hda_dsp.o
 obj-$(CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH) += snd-soc-ehl-rt5660.o
 obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH) += snd-soc-sof-sdw.o
sound/soc/intel/boards/skl_nau88l25_max98357a.c deleted +0 -704

704 lines not on this page · raw message

Signature · 1 line
2.25.1
author maintainer
#15 lore raw

PATCH v2 13/14 ASoC: Intel: Remove skylake driver

In reply to Cezary Rojewski

The avs-driver found in sound/soc/intel/avs is a direct replacement to the existing skylake-driver. It covers all features supported by it and more and aligns with the recommended flows and requirements based on Windows driver equivalent.

For the official kernel tree the deprecation begun with v6.0. Most skylake-drivers users moved to avs- or SOF-driver when AudioDSP capabilities are available on the platform or to snd-hda-intel (sound/pci/hda) when such capabilities are not.

For the supported trees the deprecation begun with v5.4 with v5.15 being the first where the skylake-driver is disabled entirely.

All machine board drivers that consume the DSP driver have their replacements present within sound/soc/intel/avs/boards/ directory.

---
 sound/soc/intel/Kconfig                 |  120 -
 sound/soc/intel/Makefile                |    1 -
 sound/soc/intel/boards/Kconfig          |    4 +-
 sound/soc/intel/skylake/Makefile        |   15 -
 sound/soc/intel/skylake/bxt-sst.c       |  629 ----
 sound/soc/intel/skylake/cnl-sst-dsp.c   |  266 --
 sound/soc/intel/skylake/cnl-sst-dsp.h   |  103 -
 sound/soc/intel/skylake/cnl-sst.c       |  508 ----
 sound/soc/intel/skylake/skl-debug.c     |  248 --
 sound/soc/intel/skylake/skl-i2s.h       |   87 -
 sound/soc/intel/skylake/skl-messages.c  | 1419 ---------
 sound/soc/intel/skylake/skl-nhlt.c      |  269 --
 sound/soc/intel/skylake/skl-pcm.c       | 1507 ----------
 sound/soc/intel/skylake/skl-ssp-clk.c   |  428 ---
 sound/soc/intel/skylake/skl-ssp-clk.h   |  108 -
 sound/soc/intel/skylake/skl-sst-cldma.c |  373 ---
 sound/soc/intel/skylake/skl-sst-cldma.h |  243 --
 sound/soc/intel/skylake/skl-sst-dsp.c   |  462 ---
 sound/soc/intel/skylake/skl-sst-dsp.h   |  256 --
 sound/soc/intel/skylake/skl-sst-ipc.c   | 1071 -------
 sound/soc/intel/skylake/skl-sst-ipc.h   |  169 --
 sound/soc/intel/skylake/skl-sst-utils.c |  425 ---
 sound/soc/intel/skylake/skl-sst.c       |  599 ----
 sound/soc/intel/skylake/skl-topology.c  | 3605 -----------------------
 sound/soc/intel/skylake/skl-topology.h  |  524 ----
 sound/soc/intel/skylake/skl.c           | 1177 --------
 sound/soc/intel/skylake/skl.h           |  207 --
 27 files changed, 2 insertions(+), 14821 deletions(-)
 delete mode 100644 sound/soc/intel/skylake/Makefile
 delete mode 100644 sound/soc/intel/skylake/bxt-sst.c
 delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.c
 delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.h
 delete mode 100644 sound/soc/intel/skylake/cnl-sst.c
 delete mode 100644 sound/soc/intel/skylake/skl-debug.c
 delete mode 100644 sound/soc/intel/skylake/skl-i2s.h
 delete mode 100644 sound/soc/intel/skylake/skl-messages.c
 delete mode 100644 sound/soc/intel/skylake/skl-nhlt.c
 delete mode 100644 sound/soc/intel/skylake/skl-pcm.c
 delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c
 delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-utils.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst.c
 delete mode 100644 sound/soc/intel/skylake/skl-topology.c
 delete mode 100644 sound/soc/intel/skylake/skl-topology.h
 delete mode 100644 sound/soc/intel/skylake/skl.c
 delete mode 100644 sound/soc/intel/skylake/skl.h
sound/soc/intel/Kconfig +0 -120
index 38b61dfd1487..a32fb0a8d7d7 100644
@@ -67,126 +67,6 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
 	  Baytrail/Cherrytrail. If you want to enable SOF on
 	  Baytrail/Cherrytrail, you need to deselect this option first.
 
-config SND_SOC_INTEL_SKYLAKE
-	tristate "All Skylake/SST Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKL
-	select SND_SOC_INTEL_APL
-	select SND_SOC_INTEL_KBL
-	select SND_SOC_INTEL_GLK
-	select SND_SOC_INTEL_CNL
-	select SND_SOC_INTEL_CFL
-	help
-	  This is a backwards-compatible option to select all devices
-	  supported by the Intel SST/Skylake driver. This option is no
-	  longer recommended and will be deprecated when the SOF
-	  driver is introduced.  Distributions should explicitly
-	  select which platform uses this driver.
-
-config SND_SOC_INTEL_SKL
-	tristate "Skylake Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKYLAKE_FAMILY
-	help
-	  If you have a Intel Skylake platform with the DSP enabled
-	  in the BIOS then enable this option by saying Y or m.
-
-config SND_SOC_INTEL_APL
-	tristate "Broxton/ApolloLake Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKYLAKE_FAMILY
-	help
-	  If you have a Intel Broxton/ApolloLake platform with the DSP
-	  enabled in the BIOS then enable this option by saying Y or m.
-
-config SND_SOC_INTEL_KBL
-	tristate "Kabylake Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKYLAKE_FAMILY
-	help
-	  If you have a Intel Kabylake platform with the DSP
-	  enabled in the BIOS then enable this option by saying Y or m.
-
-config SND_SOC_INTEL_GLK
-	tristate "GeminiLake Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKYLAKE_FAMILY
-	help
-	  If you have a Intel GeminiLake platform with the DSP
-	  enabled in the BIOS then enable this option by saying Y or m.
-
-config SND_SOC_INTEL_CNL
-	tristate "CannonLake/WhiskyLake Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKYLAKE_FAMILY
-	help
-	  If you have a Intel CNL/WHL platform with the DSP
-	  enabled in the BIOS then enable this option by saying Y or m.
-
-config SND_SOC_INTEL_CFL
-	tristate "CoffeeLake Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKYLAKE_FAMILY
-	help
-	  If you have a Intel CoffeeLake platform with the DSP
-	  enabled in the BIOS then enable this option by saying Y or m.
-
-config SND_SOC_INTEL_CML_H
-	tristate "CometLake-H Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKYLAKE_FAMILY
-	help
-	  If you have a Intel CometLake-H platform with the DSP
-	  enabled in the BIOS then enable this option by saying Y or m.
-
-config SND_SOC_INTEL_CML_LP
-	tristate "CometLake-LP Platforms"
-	depends on PCI && ACPI
-	depends on COMMON_CLK
-	select SND_SOC_INTEL_SKYLAKE_FAMILY
-	help
-	  If you have a Intel CometLake-LP platform with the DSP
-	  enabled in the BIOS then enable this option by saying Y or m.
-
-config SND_SOC_INTEL_SKYLAKE_FAMILY
-	tristate
-	select SND_SOC_INTEL_SKYLAKE_COMMON
-
-if SND_SOC_INTEL_SKYLAKE_FAMILY
-
-config SND_SOC_INTEL_SKYLAKE_SSP_CLK
-	tristate
-
-config SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
-	bool "HDAudio codec support"
-	help
-	  If you have Intel Skylake or Kabylake with HDAudio codec
-	  and DMIC present then enable this option by saying Y.
-
-config SND_SOC_INTEL_SKYLAKE_COMMON
-	tristate
-	select SND_HDA_EXT_CORE
-	select SND_HDA_DSP_LOADER
-	select SND_SOC_TOPOLOGY
-	select SND_SOC_INTEL_SST
-	select SND_SOC_HDAC_HDA
-	select SND_SOC_ACPI_INTEL_MATCH
-	select SND_INTEL_DSP_CONFIG
-	help
-	  If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/
-	  GeminiLake or CannonLake platform with the DSP enabled in the BIOS
-	  then enable this option by saying Y or m.
-
-endif ## SND_SOC_INTEL_SKYLAKE_FAMILY
-
 endif ## SND_SOC_INTEL_SST_TOPLEVEL
 
 if SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL
sound/soc/intel/Makefile +0 -1
index d44b2652c707..8ecc7047d700 100644
@@ -5,7 +5,6 @@ obj-$(CONFIG_SND_SOC) += common/
 # Platform Support
 obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/
 obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/
-obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += skylake/
 obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/
 obj-$(CONFIG_SND_SOC_INTEL_AVS) += avs/
 
sound/soc/intel/boards/Kconfig +2 -2
index ba717e401805..cb952183f5ed 100644
@@ -300,7 +300,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 
 endif ## SND_SOC_SOF_GEMINILAKE
 
-if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
+if SND_SOC_SOF_HDA_AUDIO_CODEC
 
 config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
 	tristate "Skylake+ with HDA Codecs"
@@ -316,7 +316,7 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
 	  Say Y or m if you have such a device. This is a recommended option.
 	  If unsure select "N".
 
-endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
+endif ## SND_SOC_SOF_HDA_AUDIO_CODEC
 
 if SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL
 config SND_SOC_INTEL_SOF_RT5682_MACH
sound/soc/intel/skylake/Makefile deleted +0 -15
deleted file mode 100644
index ad9be6168428..000000000000
@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-snd-soc-skl-y := skl.o skl-pcm.o skl-nhlt.o skl-messages.o skl-topology.o \
-		skl-sst-ipc.o skl-sst-dsp.o cnl-sst-dsp.o skl-sst-cldma.o \
-		skl-sst.o bxt-sst.o cnl-sst.o skl-sst-utils.o
-
-ifdef CONFIG_DEBUG_FS
-  snd-soc-skl-y += skl-debug.o
-endif
-
-obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += snd-soc-skl.o
-
-#Skylake Clock device support
-snd-soc-skl-ssp-clk-y := skl-ssp-clk.o
-
-obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK) += snd-soc-skl-ssp-clk.o
sound/soc/intel/skylake/bxt-sst.c deleted +0 -629

629 lines not on this page · raw message

sound/soc/intel/skylake/cnl-sst-dsp.c deleted +0 -266

266 lines not on this page · raw message

sound/soc/intel/skylake/cnl-sst-dsp.h deleted +0 -103

103 lines not on this page · raw message

sound/soc/intel/skylake/cnl-sst.c deleted +0 -508

508 lines not on this page · raw message

sound/soc/intel/skylake/skl-debug.c deleted +0 -248

248 lines not on this page · raw message

sound/soc/intel/skylake/skl-i2s.h deleted +0 -87

87 lines not on this page · raw message

sound/soc/intel/skylake/skl-messages.c deleted +0 -1419

995 lines not on this page · raw message

sound/soc/intel/skylake/skl-nhlt.c deleted +0 -269

269 lines not on this page · raw message

sound/soc/intel/skylake/skl-pcm.c deleted +0 -1507

1,507 lines not on this page · raw message

sound/soc/intel/skylake/skl-ssp-clk.c deleted +0 -428

428 lines not on this page · raw message

sound/soc/intel/skylake/skl-ssp-clk.h deleted +0 -108

108 lines not on this page · raw message

sound/soc/intel/skylake/skl-sst-cldma.c deleted +0 -373

373 lines not on this page · raw message

sound/soc/intel/skylake/skl-sst-cldma.h deleted +0 -243

243 lines not on this page · raw message

sound/soc/intel/skylake/skl-sst-dsp.c deleted +0 -462

462 lines not on this page · raw message

sound/soc/intel/skylake/skl-sst-dsp.h deleted +0 -256

256 lines not on this page · raw message

sound/soc/intel/skylake/skl-sst-ipc.c deleted +0 -1071

1,071 lines not on this page · raw message

sound/soc/intel/skylake/skl-sst-ipc.h deleted +0 -169

169 lines not on this page · raw message

sound/soc/intel/skylake/skl-sst-utils.c deleted +0 -425

425 lines not on this page · raw message

sound/soc/intel/skylake/skl-sst.c deleted +0 -599

599 lines not on this page · raw message

sound/soc/intel/skylake/skl-topology.c deleted +0 -3605

3,605 lines not on this page · raw message

sound/soc/intel/skylake/skl-topology.h deleted +0 -524

524 lines not on this page · raw message

sound/soc/intel/skylake/skl.c deleted +0 -1177

1,177 lines not on this page · raw message

sound/soc/intel/skylake/skl.h deleted +0 -207

207 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

author maintainer
#16 lore raw

PATCH v2 14/14 ASoC: Intel: avs: Enable by default for all SST configurations

In reply to Cezary Rojewski

The skylake-driver is deprecated in favour of the avs-driver. As the latter supports all configurations of its predecessor and more, update the existing selection mechanism to acknowledge the SST flag.

---
 sound/soc/intel/avs/core.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
sound/soc/intel/avs/core.c +7 -1
index f2dc82a2abc7..da7bac09acb4 100644
@@ -422,8 +422,14 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 	int ret;
 
 	ret = snd_intel_dsp_driver_probe(pci);
-	if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_AVS)
+	switch (ret) {
+	case SND_INTEL_DSP_DRIVER_ANY:
+	case SND_INTEL_DSP_DRIVER_SST:
+	case SND_INTEL_DSP_DRIVER_AVS:
+		break;
+	default:
 		return -ENODEV;
+	}
 
 	ret = pcim_enable_device(pci);
 	if (ret < 0)
Signature · 1 line
2.25.1
Acked-by on the v2 series
#17 lore raw
In reply to Cezary Rojewski
Quoted 21 lines · Cezary Rojewski

A spiritual successor to haswell/baytrail removal series [1].

The avs-driver found in sound/soc/intel/avs is a direct replacement to the existing skylake-driver. It covers all features supported by it and more and aligns with the recommended flows and requirements based on Windows driver equivalent.

The skylake-driver related UAPI has been removed with "ASoC: Drop soc-topology ABI v4 support" [2].

For the official kernel tree the deprecation begun with v6.0. Most skylake-drivers users moved to avs- or SOF-driver when AudioDSP capabilities are available on the platform or to snd-hda-intel (sound/pci/hda) when such capabilities are not.

For the supported trees the deprecation begun with v5.4 with v5.15 being the first where the skylake-driver is disabled entirely.

All machine board drivers that consume this DSP driver have their replacements present within sound/soc/intel/avs/boards/ directory.

Quoted 7 lines

Changes in v2:
- added two new patches (leading the series)
- the first moves all device entries previously under the skylake-driver dependency under the avs-driver
- the second patch drops struct skl_machine_pdata usage to fix compilation errors as pointed out by IKP
- no further changes, retained Acked-by tags for these

Hmm... Have you received my tag for the v1?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author maintainer
#18 lore raw
Quoted 30 lines · Andy Shevchenko
Quoted 21 lines · Cezary Rojewski

A spiritual successor to haswell/baytrail removal series [1].

The avs-driver found in sound/soc/intel/avs is a direct replacement to the existing skylake-driver. It covers all features supported by it and more and aligns with the recommended flows and requirements based on Windows driver equivalent.

The skylake-driver related UAPI has been removed with "ASoC: Drop soc-topology ABI v4 support" [2].

For the official kernel tree the deprecation begun with v6.0. Most skylake-drivers users moved to avs- or SOF-driver when AudioDSP capabilities are available on the platform or to snd-hda-intel (sound/pci/hda) when such capabilities are not.

For the supported trees the deprecation begun with v5.4 with v5.15 being the first where the skylake-driver is disabled entirely.

All machine board drivers that consume this DSP driver have their replacements present within sound/soc/intel/avs/boards/ directory.

Quoted 7 lines

Changes in v2:
- added two new patches (leading the series)
- the first moves all device entries previously under the skylake-driver dependency under the avs-driver
- the second patch drops struct skl_machine_pdata usage to fix compilation errors as pointed out by IKP
- no further changes, retained Acked-by tags for these

Quoted 3 lines

Hmm... Have you received my tag for the v1?

Yeah, I've left the tags alone for patches 3-14 but for the newly added two I did not as that would be inappropriate. The first two patches address the problems reported by IKP bot - I've not been dealing with sound/soc/intel/common/ for a while and have forgotten about its existence.

Thank you for reviewing the series!

Kind regards,
Czarek

maintainer
#19 lore raw
In reply to Cezary Rojewski
Quoted 8 lines · Cezary Rojewski

A spiritual successor to haswell/baytrail removal series [1].

The avs-driver found in sound/soc/intel/avs is a direct replacement to the existing skylake-driver. It covers all features supported by it and more and aligns with the recommended flows and requirements based on Windows driver equivalent.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[01/14] ALSA: hda: Move SST device entries to AVS

        commit: ec7bccd770b628a465458194aeac4408cdcc5ccd
[02/14] ASoC: Intel: Drop skl_machine_pdata usage
        commit: cd5c4dd97f35cd7cf772fc8c12738bd971cbb58e
[03/14] ASoC: Intel: Remove bxt_rt298 board driver
        commit: 4d61ed7609d8b8fef71f78db6a8ac3221a46ea17
[04/14] ASoC: Intel: Remove bxt_da7219_max98357a board driver
        commit: fa07502e01569b39265008bac783a1202a7560e5
[05/14] ASoC: Intel: Remove kbl_rt5663_rt5514_max98927 board driver
        commit: a08b5fde945ef8b427d2d29515a806fe571d7639
[06/14] ASoC: Intel: Remove kbl_rt5663_max98927 board driver
        commit: 1af24289751253e58850ba572c584f7e6b1caa87
[07/14] ASoC: Intel: Remove kbl_rt5660 board driver
        commit: 1a40ef882fee37006243ebf0b4848c7811672fe2
[08/14] ASoC: Intel: Remove kbl_da7219_max98927 board driver
        commit: 1daa8dce04619f39d4d8ee43ae2a0cec9ab31897
[09/14] ASoC: Intel: Remove kbl_da7219_max98357a board driver
        commit: 15d6966580f3e40fe2f4ecfcde2edd69cc5508e9
[10/14] ASoC: Intel: Remove skl_rt286 board driver
        commit: 51d8e9b20db840e78e0d1ff585cf4c8eb4e091b0
[11/14] ASoC: Intel: Remove skl_nau88l25_ssm4567 board driver
        commit: 4dbf2f9a725d1370d67f9a3bce2f33e913b57e52
[12/14] ASoC: Intel: Remove skl_nau88l25_max98357a board driver
        commit: 6de8dddc56b0577df996212b634f82f6f1fb013c
[13/14] ASoC: Intel: Remove skylake driver
        commit: 46e211411113932be1fd31580a03502466648f91
[14/14] ASoC: Intel: avs: Enable by default for all SST configurations
        commit: 526139aff1d14c5a2cc0a769c063f439444c61c2

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark