kevin/linux
1
Fork 0
Code

ASoC: Intel: Drop skl_machine_pdata usage

Browse Source 
Preparation step in the skylake-driver removal process.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20240814083929.1217319-3-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Cezary Rojewski 2024-08-14 10:39:17 +02:00 committed by Mark Brown
parent ec7bccd770
commit cd5c4dd97f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
6 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/intel/common/soc-acpi-intel-cnl-match.c
View File

@ -8,7 +8,6 @@
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include <sound/soc-acpi-intel-match.h> #include <sound/soc-acpi-intel-match.h>
#include "../skylake/skl.h"
#include "soc-acpi-intel-sdw-mockup-match.h" #include "soc-acpi-intel-sdw-mockup-match.h"
static const struct snd_soc_acpi_codecs essx_83x6 = { 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"}, .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[] = { struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
{ {
.id = "INT34C2", .id = "INT34C2",
.drv_name = "cnl_rt274", .drv_name = "cnl_rt274",
.fw_filename = "intel/dsp_fw_cnl.bin", .fw_filename = "intel/dsp_fw_cnl.bin",
.pdata = &cnl_pdata,
.sof_tplg_filename = "sof-cnl-rt274.tplg", .sof_tplg_filename = "sof-cnl-rt274.tplg",
}, },
{ {

1
sound/soc/intel/common/soc-acpi-intel-ehl-match.c
View File

@ -8,7 +8,6 @@
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include <sound/soc-acpi-intel-match.h> #include <sound/soc-acpi-intel-match.h>
#include "../skylake/skl.h"
struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[] = { struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[] = {
{ {

6
sound/soc/intel/common/soc-acpi-intel-hda-match.c
View File

@ -8,11 +8,6 @@
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include <sound/soc-acpi-intel-match.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[] = { 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 * can be used if we need a more complicated machine driver
* combining HDA+other device (e.g. DMIC). * combining HDA+other device (e.g. DMIC).
*/ */
.pdata = &hda_pdata,
}, },
{}, {},
}; };

6
sound/soc/intel/common/soc-acpi-intel-icl-match.c
View File

@ -8,23 +8,17 @@
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include <sound/soc-acpi-intel-match.h> #include <sound/soc-acpi-intel-match.h>
#include "../skylake/skl.h"
static const struct snd_soc_acpi_codecs essx_83x6 = { static const struct snd_soc_acpi_codecs essx_83x6 = {
.num_codecs = 3, .num_codecs = 3,
.codecs = { "ESSX8316", "ESSX8326", "ESSX8336"}, .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[] = { struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = {
{ {
.id = "INT34C2", .id = "INT34C2",
.drv_name = "icl_rt274", .drv_name = "icl_rt274",
.fw_filename = "intel/dsp_fw_icl.bin", .fw_filename = "intel/dsp_fw_icl.bin",
.pdata = &icl_pdata,
.sof_tplg_filename = "sof-icl-rt274.tplg", .sof_tplg_filename = "sof-icl-rt274.tplg",
}, },
{ {

11
sound/soc/intel/common/soc-acpi-intel-kbl-match.c
View File

@ -8,9 +8,6 @@
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include <sound/soc-acpi-intel-match.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 = { static const struct snd_soc_acpi_codecs kbl_codecs = {
.num_codecs = 1, .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", .fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_codecs, .quirk_data = &kbl_codecs,
.pdata = &skl_dmic_data,
}, },
{ {
.id = "MX98357A", .id = "MX98357A",
@ -62,7 +58,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
.fw_filename = "intel/dsp_fw_kbl.bin", .fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_codecs, .quirk_data = &kbl_codecs,
.pdata = &skl_dmic_data,
}, },
{ {
.id = "MX98927", .id = "MX98927",
@ -70,7 +65,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
.fw_filename = "intel/dsp_fw_kbl.bin", .fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_5663_5514_codecs, .quirk_data = &kbl_5663_5514_codecs,
.pdata = &skl_dmic_data,
}, },
{ {
.id = "MX98927", .id = "MX98927",
@ -78,7 +72,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
.fw_filename = "intel/dsp_fw_kbl.bin", .fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_poppy_codecs, .quirk_data = &kbl_poppy_codecs,
.pdata = &skl_dmic_data,
}, },
{ {
.id = "10EC5663", .id = "10EC5663",
@ -91,7 +84,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
.fw_filename = "intel/dsp_fw_kbl.bin", .fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_7219_98357_codecs, .quirk_data = &kbl_7219_98357_codecs,
.pdata = &skl_dmic_data,
}, },
{ {
.id = "DLGS7219", .id = "DLGS7219",
@ -99,7 +91,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
.fw_filename = "intel/dsp_fw_kbl.bin", .fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_7219_98927_codecs, .quirk_data = &kbl_7219_98927_codecs,
.pdata = &skl_dmic_data
}, },
{ {
.id = "10EC5660", .id = "10EC5660",
@ -117,13 +108,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
.fw_filename = "intel/dsp_fw_kbl.bin", .fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_7219_98373_codecs, .quirk_data = &kbl_7219_98373_codecs,
.pdata = &skl_dmic_data
}, },
{ {
.id = "MX98373", .id = "MX98373",
.drv_name = "kbl_max98373", .drv_name = "kbl_max98373",
.fw_filename = "intel/dsp_fw_kbl.bin", .fw_filename = "intel/dsp_fw_kbl.bin",
.pdata = &skl_dmic_data
}, },
{}, {},
}; };

5
sound/soc/intel/common/soc-acpi-intel-skl-match.c
View File

@ -8,9 +8,6 @@
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include <sound/soc-acpi-intel-match.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 = { static const struct snd_soc_acpi_codecs skl_codecs = {
.num_codecs = 1, .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", .fw_filename = "intel/dsp_fw_release.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &skl_codecs, .quirk_data = &skl_codecs,
.pdata = &skl_dmic_data,
}, },
{ {
.id = "MX98357A", .id = "MX98357A",
@ -37,7 +33,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_skl_machines[] = {
.fw_filename = "intel/dsp_fw_release.bin", .fw_filename = "intel/dsp_fw_release.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &skl_codecs, .quirk_data = &skl_codecs,
.pdata = &skl_dmic_data,
}, },
{}, {},
}; };