Skip to content

Refactoring topology name fixup of Intel mach #5037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 3 commits into from
Jul 26, 2024
Merged

Refactoring topology name fixup of Intel mach #5037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9be7b36
ASoC: Intel: Skylake: remove HDA machine driver support
brentlu Jul 19, 2024
acadc4b
ASoC: SOF: Intel: hda: refactoring topology name fixup for HDA mach
brentlu May 30, 2024
dbab6ca
ASoC: SOF: Intel: hda: refactoring topology name fixup for SDW mach
brentlu Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions sound/soc/intel/common/soc-acpi-intel-hda-match.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,13 @@

#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[] = {
{
/* .id is not used in this file */
.drv_name = "skl_hda_dsp_generic",

/* .fw_filename is dynamically set in skylake driver */

.sof_tplg_filename = "sof-hda-generic.tplg",

/*
* .machine_quirk and .quirk_data are not used here but
* can be used if we need a more complicated machine driver
* combining HDA+other device (e.g. DMIC).
*/
.pdata = &hda_pdata,
.sof_tplg_filename = "sof-hda-generic", /* the tplg suffix is added at run time */
.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,
},
{},
};
Expand Down
22 changes: 2 additions & 20 deletions sound/soc/intel/skylake/skl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,20 +471,6 @@ static struct skl_ssp_clk skl_ssp_clks[] = {
{.name = "ssp5_sclkfs"},
};

static struct snd_soc_acpi_mach *skl_find_hda_machine(struct skl_dev *skl,
struct snd_soc_acpi_mach *machines)
{
struct snd_soc_acpi_mach *mach;

/* point to common table */
mach = snd_soc_acpi_intel_hda_machines;

/* all entries in the machine table use the same firmware */
mach->fw_filename = machines->fw_filename;

return mach;
}

static int skl_find_machine(struct skl_dev *skl, void *driver_data)
{
struct hdac_bus *bus = skl_to_bus(skl);
Expand All @@ -493,12 +479,8 @@ static int skl_find_machine(struct skl_dev *skl, void *driver_data)

mach = snd_soc_acpi_find_machine(mach);
if (!mach) {
dev_dbg(bus->dev, "No matching I2S machine driver found\n");
mach = skl_find_hda_machine(skl, driver_data);
if (!mach) {
dev_err(bus->dev, "No matching machine driver found\n");
return -ENODEV;
}
dev_err(bus->dev, "No matching I2S machine driver found\n");
return -ENODEV;
}

skl->mach = mach;
Expand Down
Loading