* [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology
@ 2017-10-09 5:50 Guneshwor Singh
2017-10-09 5:50 ` [PATCH 1/3] ASoC: Intel: Skylake: Add flag to check to register " Guneshwor Singh
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Guneshwor Singh @ 2017-10-09 5:50 UTC (permalink / raw)
To: alsa-devel, Mark Brown
Cc: Takashi Iwai, Liam Girdwood, Vinod Koul, Guneshwor Singh,
Patches Audio
This series adds support for loading FE dais using topology. A flag is
introduced to decide whether to register FE dais defined in the platform
driver or use from topology. By default, it is set to register the FE
dais defined in the platform driver. While at it, fix a missing sentinel
too.
Guneshwor Singh (3):
ASoC: Intel: Skylake: Add flag to check to register FE dais from
topology
ASoC: Intel: Skylake: Add dai load ops for dais from topology
ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach
sound/soc/intel/skylake/skl-pcm.c | 46 +++++++++++++++++++++++++++++++---
sound/soc/intel/skylake/skl-topology.c | 1 +
sound/soc/intel/skylake/skl-topology.h | 3 +++
sound/soc/intel/skylake/skl.c | 10 +++++++-
sound/soc/intel/skylake/skl.h | 4 ++-
5 files changed, 58 insertions(+), 6 deletions(-)
--
2.14.2
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/3] ASoC: Intel: Skylake: Add flag to check to register FE dais from topology 2017-10-09 5:50 [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology Guneshwor Singh @ 2017-10-09 5:50 ` Guneshwor Singh 2017-10-13 19:25 ` Applied "ASoC: Intel: Skylake: Add flag to check to register FE dais from topology" to the asoc tree Mark Brown 2017-10-09 5:50 ` [PATCH 2/3] ASoC: Intel: Skylake: Add dai load ops for dais from topology Guneshwor Singh ` (2 subsequent siblings) 3 siblings, 1 reply; 8+ messages in thread From: Guneshwor Singh @ 2017-10-09 5:50 UTC (permalink / raw) To: alsa-devel, Mark Brown Cc: Takashi Iwai, Liam Girdwood, Vinod Koul, Guneshwor Singh, Patches Audio 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> --- sound/soc/intel/skylake/skl-pcm.c | 38 ++++++++++++++++++++++++++++++++++---- sound/soc/intel/skylake/skl.c | 9 ++++++++- sound/soc/intel/skylake/skl.h | 4 +++- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 2b1e513b1680..9ca69b1fc128 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -652,7 +652,7 @@ static const struct snd_soc_dai_ops skl_link_dai_ops = { .trigger = skl_link_pcm_trigger, }; -static struct snd_soc_dai_driver skl_platform_dai[] = { +static struct snd_soc_dai_driver skl_fe_dai[] = { { .name = "System Pin", .ops = &skl_pcm_dai_ops, @@ -796,8 +796,10 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { .sig_bits = 32, }, }, +}; /* BE CPU Dais */ +static struct snd_soc_dai_driver skl_platform_dai[] = { { .name = "SSP0 Pin", .ops = &skl_be_ssp_dai_ops, @@ -1362,6 +1364,8 @@ int skl_platform_register(struct device *dev) int ret; struct hdac_ext_bus *ebus = dev_get_drvdata(dev); struct skl *skl = ebus_to_skl(ebus); + struct snd_soc_dai_driver *dais; + int num_dais = ARRAY_SIZE(skl_platform_dai); INIT_LIST_HEAD(&skl->ppl_list); INIT_LIST_HEAD(&skl->bind_list); @@ -1371,14 +1375,38 @@ int skl_platform_register(struct device *dev) dev_err(dev, "soc platform registration failed %d\n", ret); return ret; } + + skl->dais = kmemdup(skl_platform_dai, sizeof(skl_platform_dai), + GFP_KERNEL); + if (!skl->dais) { + ret = -ENOMEM; + goto err; + } + + if (!skl->use_tplg_pcm) { + dais = krealloc(skl->dais, sizeof(skl_fe_dai) + + sizeof(skl_platform_dai), GFP_KERNEL); + if (!dais) { + ret = -ENOMEM; + goto err; + } + + skl->dais = dais; + memcpy(&skl->dais[ARRAY_SIZE(skl_platform_dai)], skl_fe_dai, + sizeof(skl_fe_dai)); + num_dais += ARRAY_SIZE(skl_fe_dai); + } + ret = snd_soc_register_component(dev, &skl_component, - skl_platform_dai, - ARRAY_SIZE(skl_platform_dai)); + skl->dais, num_dais); if (ret) { dev_err(dev, "soc component registration failed %d\n", ret); - snd_soc_unregister_platform(dev); + goto err; } + return 0; +err: + snd_soc_unregister_platform(dev); return ret; } @@ -1398,5 +1426,7 @@ int skl_platform_unregister(struct device *dev) snd_soc_unregister_component(dev); snd_soc_unregister_platform(dev); + kfree(skl->dais); + return 0; } 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, }, }; diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index 8d9d6899f761..e00cde8200dd 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -53,6 +53,7 @@ struct skl { struct platform_device *dmic_dev; struct platform_device *i2s_dev; struct snd_soc_platform *platform; + struct snd_soc_dai_driver *dais; struct nhlt_acpi_table *nhlt; /* nhlt ptr */ struct skl_sst *skl_sst; /* sst skl ctx */ @@ -73,6 +74,7 @@ struct skl { struct skl_debug *debugfs; u8 nr_modules; struct skl_module **modules; + bool use_tplg_pcm; }; #define skl_to_ebus(s) (&(s)->ebus) @@ -85,9 +87,9 @@ struct skl_dma_params { u8 stream_tag; }; -/* to pass dmic data */ struct skl_machine_pdata { u32 dmic_num; + bool use_tplg_pcm; /* use dais and dai links from topology */ }; struct skl_dsp_ops { -- 2.14.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Applied "ASoC: Intel: Skylake: Add flag to check to register FE dais from topology" to the asoc tree 2017-10-09 5:50 ` [PATCH 1/3] ASoC: Intel: Skylake: Add flag to check to register " Guneshwor Singh @ 2017-10-13 19:25 ` Mark Brown 0 siblings, 0 replies; 8+ messages in thread From: Mark Brown @ 2017-10-13 19:25 UTC (permalink / raw) To: Guneshwor Singh Cc: alsa-devel, Takashi Iwai, Patches Audio, Liam Girdwood, Vinod Koul, Mark Brown The patch ASoC: Intel: Skylake: Add flag to check to register FE dais from topology has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c3ae22e39db79bee1909d398c0debe2f7cb87d3a Mon Sep 17 00:00:00 2001 From: Guneshwor Singh <guneshwor.o.singh@intel.com> Date: Mon, 9 Oct 2017 11:20:30 +0530 Subject: [PATCH] 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> --- sound/soc/intel/skylake/skl-pcm.c | 38 ++++++++++++++++++++++++++++++++++---- sound/soc/intel/skylake/skl.c | 9 ++++++++- sound/soc/intel/skylake/skl.h | 4 +++- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 2b1e513b1680..9ca69b1fc128 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -652,7 +652,7 @@ static const struct snd_soc_dai_ops skl_link_dai_ops = { .trigger = skl_link_pcm_trigger, }; -static struct snd_soc_dai_driver skl_platform_dai[] = { +static struct snd_soc_dai_driver skl_fe_dai[] = { { .name = "System Pin", .ops = &skl_pcm_dai_ops, @@ -796,8 +796,10 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { .sig_bits = 32, }, }, +}; /* BE CPU Dais */ +static struct snd_soc_dai_driver skl_platform_dai[] = { { .name = "SSP0 Pin", .ops = &skl_be_ssp_dai_ops, @@ -1362,6 +1364,8 @@ int skl_platform_register(struct device *dev) int ret; struct hdac_ext_bus *ebus = dev_get_drvdata(dev); struct skl *skl = ebus_to_skl(ebus); + struct snd_soc_dai_driver *dais; + int num_dais = ARRAY_SIZE(skl_platform_dai); INIT_LIST_HEAD(&skl->ppl_list); INIT_LIST_HEAD(&skl->bind_list); @@ -1371,14 +1375,38 @@ int skl_platform_register(struct device *dev) dev_err(dev, "soc platform registration failed %d\n", ret); return ret; } + + skl->dais = kmemdup(skl_platform_dai, sizeof(skl_platform_dai), + GFP_KERNEL); + if (!skl->dais) { + ret = -ENOMEM; + goto err; + } + + if (!skl->use_tplg_pcm) { + dais = krealloc(skl->dais, sizeof(skl_fe_dai) + + sizeof(skl_platform_dai), GFP_KERNEL); + if (!dais) { + ret = -ENOMEM; + goto err; + } + + skl->dais = dais; + memcpy(&skl->dais[ARRAY_SIZE(skl_platform_dai)], skl_fe_dai, + sizeof(skl_fe_dai)); + num_dais += ARRAY_SIZE(skl_fe_dai); + } + ret = snd_soc_register_component(dev, &skl_component, - skl_platform_dai, - ARRAY_SIZE(skl_platform_dai)); + skl->dais, num_dais); if (ret) { dev_err(dev, "soc component registration failed %d\n", ret); - snd_soc_unregister_platform(dev); + goto err; } + return 0; +err: + snd_soc_unregister_platform(dev); return ret; } @@ -1398,5 +1426,7 @@ int skl_platform_unregister(struct device *dev) snd_soc_unregister_component(dev); snd_soc_unregister_platform(dev); + kfree(skl->dais); + return 0; } 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, }, }; diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index 8d9d6899f761..e00cde8200dd 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -53,6 +53,7 @@ struct skl { struct platform_device *dmic_dev; struct platform_device *i2s_dev; struct snd_soc_platform *platform; + struct snd_soc_dai_driver *dais; struct nhlt_acpi_table *nhlt; /* nhlt ptr */ struct skl_sst *skl_sst; /* sst skl ctx */ @@ -73,6 +74,7 @@ struct skl { struct skl_debug *debugfs; u8 nr_modules; struct skl_module **modules; + bool use_tplg_pcm; }; #define skl_to_ebus(s) (&(s)->ebus) @@ -85,9 +87,9 @@ struct skl_dma_params { u8 stream_tag; }; -/* to pass dmic data */ struct skl_machine_pdata { u32 dmic_num; + bool use_tplg_pcm; /* use dais and dai links from topology */ }; struct skl_dsp_ops { -- 2.14.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] ASoC: Intel: Skylake: Add dai load ops for dais from topology 2017-10-09 5:50 [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology Guneshwor Singh 2017-10-09 5:50 ` [PATCH 1/3] ASoC: Intel: Skylake: Add flag to check to register " Guneshwor Singh @ 2017-10-09 5:50 ` Guneshwor Singh 2017-10-13 19:25 ` Applied "ASoC: Intel: Skylake: Add dai load ops for dais from topology" to the asoc tree Mark Brown 2017-10-09 5:50 ` [PATCH 3/3] ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach Guneshwor Singh 2017-10-13 9:22 ` [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology Vinod Koul 3 siblings, 1 reply; 8+ messages in thread From: Guneshwor Singh @ 2017-10-09 5:50 UTC (permalink / raw) To: alsa-devel, Mark Brown Cc: Takashi Iwai, Liam Girdwood, Vinod Koul, Guneshwor Singh, Patches Audio Since FE dais can come from topology, add dai_load ops for the dais from topology. Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com> --- sound/soc/intel/skylake/skl-pcm.c | 8 ++++++++ sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl-topology.h | 3 +++ 3 files changed, 12 insertions(+) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 9ca69b1fc128..4380e40c6af0 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -977,6 +977,14 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { }, }; +int skl_dai_load(struct snd_soc_component *cmp, + struct snd_soc_dai_driver *pcm_dai) +{ + pcm_dai->ops = &skl_pcm_dai_ops; + + return 0; +} + static int skl_platform_open(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 27bcb62568fb..a96f02109540 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3331,6 +3331,7 @@ static struct snd_soc_tplg_ops skl_tplg_ops = { .io_ops = skl_tplg_kcontrol_ops, .io_ops_count = ARRAY_SIZE(skl_tplg_kcontrol_ops), .manifest = skl_manifest_load, + .dai_load = skl_dai_load, }; /* diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index bc3c29161ed0..b10b53597eae 100644 --- a/sound/soc/intel/skylake/skl-topology.h +++ b/sound/soc/intel/skylake/skl-topology.h @@ -502,4 +502,7 @@ int skl_pcm_host_dma_prepare(struct device *dev, struct skl_pipe_params *params); int skl_pcm_link_dma_prepare(struct device *dev, struct skl_pipe_params *params); + +int skl_dai_load(struct snd_soc_component *cmp, + struct snd_soc_dai_driver *pcm_dai); #endif -- 2.14.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Applied "ASoC: Intel: Skylake: Add dai load ops for dais from topology" to the asoc tree 2017-10-09 5:50 ` [PATCH 2/3] ASoC: Intel: Skylake: Add dai load ops for dais from topology Guneshwor Singh @ 2017-10-13 19:25 ` Mark Brown 0 siblings, 0 replies; 8+ messages in thread From: Mark Brown @ 2017-10-13 19:25 UTC (permalink / raw) To: Guneshwor Singh Cc: alsa-devel, Takashi Iwai, Patches Audio, Liam Girdwood, Vinod Koul, Mark Brown The patch ASoC: Intel: Skylake: Add dai load ops for dais from topology has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 606e21fd6f43b9be8c7d9df8bc415f1637fbeb04 Mon Sep 17 00:00:00 2001 From: Guneshwor Singh <guneshwor.o.singh@intel.com> Date: Mon, 9 Oct 2017 11:20:31 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Add dai load ops for dais from topology Since FE dais can come from topology, add dai_load ops for the dais from topology. 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> --- sound/soc/intel/skylake/skl-pcm.c | 8 ++++++++ sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl-topology.h | 3 +++ 3 files changed, 12 insertions(+) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 9ca69b1fc128..4380e40c6af0 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -977,6 +977,14 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { }, }; +int skl_dai_load(struct snd_soc_component *cmp, + struct snd_soc_dai_driver *pcm_dai) +{ + pcm_dai->ops = &skl_pcm_dai_ops; + + return 0; +} + static int skl_platform_open(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 22f768ca3c73..ff4f53cdc0a1 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3331,6 +3331,7 @@ static struct snd_soc_tplg_ops skl_tplg_ops = { .io_ops = skl_tplg_kcontrol_ops, .io_ops_count = ARRAY_SIZE(skl_tplg_kcontrol_ops), .manifest = skl_manifest_load, + .dai_load = skl_dai_load, }; /* diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index e11cc1fc0e43..d116599bfdd7 100644 --- a/sound/soc/intel/skylake/skl-topology.h +++ b/sound/soc/intel/skylake/skl-topology.h @@ -501,4 +501,7 @@ int skl_pcm_host_dma_prepare(struct device *dev, struct skl_pipe_params *params); int skl_pcm_link_dma_prepare(struct device *dev, struct skl_pipe_params *params); + +int skl_dai_load(struct snd_soc_component *cmp, + struct snd_soc_dai_driver *pcm_dai); #endif -- 2.14.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach 2017-10-09 5:50 [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology Guneshwor Singh 2017-10-09 5:50 ` [PATCH 1/3] ASoC: Intel: Skylake: Add flag to check to register " Guneshwor Singh 2017-10-09 5:50 ` [PATCH 2/3] ASoC: Intel: Skylake: Add dai load ops for dais from topology Guneshwor Singh @ 2017-10-09 5:50 ` Guneshwor Singh 2017-10-13 19:25 ` Applied "ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach" to the asoc tree Mark Brown 2017-10-13 9:22 ` [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology Vinod Koul 3 siblings, 1 reply; 8+ messages in thread From: Guneshwor Singh @ 2017-10-09 5:50 UTC (permalink / raw) To: alsa-devel, Mark Brown Cc: Takashi Iwai, Liam Girdwood, Vinod Koul, Guneshwor Singh, Patches Audio To make it consistent, add sentinel for sst_cnl_devdata also. Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com> --- sound/soc/intel/skylake/skl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 143ade31562f..4abbd90e394c 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -1011,6 +1011,7 @@ static const struct sst_acpi_mach sst_cnl_devdata[] = { .fw_filename = "intel/dsp_fw_cnl.bin", .pdata = &cnl_pdata, }, + {} }; /* PCI IDs */ -- 2.14.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Applied "ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach" to the asoc tree 2017-10-09 5:50 ` [PATCH 3/3] ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach Guneshwor Singh @ 2017-10-13 19:25 ` Mark Brown 0 siblings, 0 replies; 8+ messages in thread From: Mark Brown @ 2017-10-13 19:25 UTC (permalink / raw) To: Guneshwor Singh Cc: alsa-devel, Takashi Iwai, Patches Audio, Liam Girdwood, Vinod Koul, Mark Brown The patch ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 364497aca1f5fdf220bd314e0550881b97d2f0fc Mon Sep 17 00:00:00 2001 From: Guneshwor Singh <guneshwor.o.singh@intel.com> Date: Mon, 9 Oct 2017 11:20:32 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach To make it consistent, add sentinel for sst_cnl_devdata also. 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> --- sound/soc/intel/skylake/skl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 143ade31562f..4abbd90e394c 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -1011,6 +1011,7 @@ static const struct sst_acpi_mach sst_cnl_devdata[] = { .fw_filename = "intel/dsp_fw_cnl.bin", .pdata = &cnl_pdata, }, + {} }; /* PCI IDs */ -- 2.14.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology 2017-10-09 5:50 [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology Guneshwor Singh ` (2 preceding siblings ...) 2017-10-09 5:50 ` [PATCH 3/3] ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach Guneshwor Singh @ 2017-10-13 9:22 ` Vinod Koul 3 siblings, 0 replies; 8+ messages in thread From: Vinod Koul @ 2017-10-13 9:22 UTC (permalink / raw) To: Guneshwor Singh Cc: Takashi Iwai, Liam Girdwood, alsa-devel, Mark Brown, Patches Audio On Mon, Oct 09, 2017 at 11:20:29AM +0530, Guneshwor Singh wrote: > This series adds support for loading FE dais using topology. A flag is > introduced to decide whether to register FE dais defined in the platform > driver or use from topology. By default, it is set to register the FE > dais defined in the platform driver. While at it, fix a missing sentinel > too. Acked-By: Vinod Koul <vinod.koul@intel.com> > Guneshwor Singh (3): > ASoC: Intel: Skylake: Add flag to check to register FE dais from > topology > ASoC: Intel: Skylake: Add dai load ops for dais from topology > ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach > > sound/soc/intel/skylake/skl-pcm.c | 46 +++++++++++++++++++++++++++++++--- > sound/soc/intel/skylake/skl-topology.c | 1 + > sound/soc/intel/skylake/skl-topology.h | 3 +++ > sound/soc/intel/skylake/skl.c | 10 +++++++- > sound/soc/intel/skylake/skl.h | 4 ++- > 5 files changed, 58 insertions(+), 6 deletions(-) > > -- > 2.14.2 > -- ~Vinod ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-10-13 19:26 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-10-09 5:50 [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology Guneshwor Singh 2017-10-09 5:50 ` [PATCH 1/3] ASoC: Intel: Skylake: Add flag to check to register " Guneshwor Singh 2017-10-13 19:25 ` Applied "ASoC: Intel: Skylake: Add flag to check to register FE dais from topology" to the asoc tree Mark Brown 2017-10-09 5:50 ` [PATCH 2/3] ASoC: Intel: Skylake: Add dai load ops for dais from topology Guneshwor Singh 2017-10-13 19:25 ` Applied "ASoC: Intel: Skylake: Add dai load ops for dais from topology" to the asoc tree Mark Brown 2017-10-09 5:50 ` [PATCH 3/3] ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach Guneshwor Singh 2017-10-13 19:25 ` Applied "ASoC: Intel: Skylake: Fix missing sentinel in sst_acpi_mach" to the asoc tree Mark Brown 2017-10-13 9:22 ` [PATCH 0/3] ASoC: Intel: Skylake: Add support for loading FE dais from topology Vinod Koul
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).