ASoC: Intel: Drop skl_machine_pdata usage

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>

diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
index 3df89e4511da741053c5d131ba0e7789a8030e9b..8bbb1052faf232928cd09ed7011ffb87d6cf9beb 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
@@ -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",
        },
        {

diff --git a/sound/soc/intel/common/soc-acpi-intel-ehl-match.c b/sound/soc/intel/common/soc-acpi-intel-ehl-match.c
index 84639c41a2683f94d038476f01510ef96b3777e0..78255d56b08c431d3f72881720afb85ce15e1289 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ehl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ehl-match.c
@@ -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[] = {
        {

diff --git a/sound/soc/intel/common/soc-acpi-intel-hda-match.c b/sound/soc/intel/common/soc-acpi-intel-hda-match.c
index 2017fd0d676f1b4b3d6ccae14acb4a0fb35b5c82..007ccd8a60e507c82dc247fe353c791c779910dc 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-hda-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-hda-match.c
@@ -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,
        },
        {},
 };

diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
index 39875d67dcd1d3b48a64c5db96c580fedfc53e12..6ce75fbb842e141667503d8c43e2c9c0cff6101e 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
@@ -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",
        },
        {

diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
index 4e817f559d3884f8c94094b6de78112fed708a2f..d4c158d8441b8054ef3469597bc925bb3c94b974 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
@@ -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
        },
        {},
 };

diff --git a/sound/soc/intel/common/soc-acpi-intel-skl-match.c b/sound/soc/intel/common/soc-acpi-intel-skl-match.c
index 75302e9567424415b1d6bb6259b8c9a91faef07b..ee64632029185579395ab1ea4574574ec2a73aaa 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-skl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-skl-match.c
@@ -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,
        },
        {},
 };