diff options
| author |   Guneshwor Singh <guneshwor.o.singh@intel.com> | 2017-10-09 11:20:30 +0530 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-10-13 20:25:03 +0100 |
| commit | c3ae22e39db79bee1909d398c0debe2f7cb87d3a (patch) | |
| tree | 2e3931583557f6de41272f120f1e8fe622ec3d93 /sound/soc/intel/skylake/skl.c | |
| parent | ASoC: Intel: Skylake: Modify skl_dsp_set_dma_control API arguments (diff) | |
| download | linux-dev-c3ae22e39db79bee1909d398c0debe2f7cb87d3a.tar.xz linux-dev-c3ae22e39db79bee1909d398c0debe2f7cb87d3a.zip | |
ASoC: Intel: Skylake: Add flag to check to register FE dais from topology
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>
Diffstat (limited to 'sound/soc/intel/skylake/skl.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index f94b484abb99..143ade31562f 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -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, }, }; |