xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Intel: Skylake: Add flag to check to register FE dais from topology

Browse Source 
Since FE dais can come from topology, split the FE dais from existing
dai array so that FE dais need not be registered if they come from
topology. Add use_tplg_pcm flag to check whether FE dais will be
registered from topology during dai driver component registration.

Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Guneshwor Singh
2017-10-09 11:20:30 +05:30
committed by Mark Brown
parent 5514830dff
commit c3ae22e39d
3 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -462,8 +462,11 @@ static int skl_machine_device_register(struct skl *skl, void *driver_data)
return -EIO;
}
if (mach->pdata)
if (mach->pdata) {
skl->use_tplg_pcm =
((struct skl_machine_pdata *)mach->pdata)->use_tplg_pcm;
dev_set_drvdata(&pdev->dev, mach->pdata);
}
skl->i2s_dev = pdev;
@@ -900,6 +903,9 @@ static struct sst_codecs kbl_5663_5514_codecs = {
.codecs = {"10EC5663", "10EC5514"}
};
static struct skl_machine_pdata cnl_pdata = {
.use_tplg_pcm = true,
};
static struct sst_acpi_mach sst_skl_devdata[] = {
{
@@ -1003,6 +1009,7 @@ static const struct sst_acpi_mach sst_cnl_devdata[] = {
.id = "INT34C2",
.drv_name = "cnl_rt274",
.fw_filename = "intel/dsp_fw_cnl.bin",
.pdata = &cnl_pdata,
},
};