redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: Intel: Skylake: cleanup before moving ACPI tables 

There is no need to deal with DMICs if the DSP is not present and
there is no ACPI machine ID found.

Simplify before moving these ACPI tables to sound/soc/intel/common

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.1
Pierre-Louis Bossart 2018-06-18 13:29:36 -05:00 committed by Mark Brown
parent 95555f580d
commit 5f15f267da
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/intel/skylake/skl.c
View File

@ -500,10 +500,12 @@ static int skl_find_machine(struct skl *skl, void *driver_data)
skl->mach = mach;
skl->fw_name = mach->fw_filename;
pdata = skl->mach->pdata;
pdata = mach->pdata;
if (mach->pdata)
if (pdata) {
skl->use_tplg_pcm = pdata->use_tplg_pcm;
pdata->dmic_num = skl_get_dmic_geo(skl);
}
return 0;
}
@ -930,8 +932,6 @@ static int skl_probe(struct pci_dev *pci,
pci_set_drvdata(skl->pci, ebus);
skl_dmic_data.dmic_num = skl_get_dmic_geo(skl);
/* check if dsp is there */
if (bus->ppcap) {
/* create device for dsp clk */