ASoC: intel/skl/hda - export number of digital microphones via control components
Subsystems (4)
Jaroslav Kysela
maintainerPATCH 1/1 ASoC: intel/skl/hda - export number of digital microphones via control components
It is required for the auto-detection in the user space (for UCM).
--- sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 ++++++++ sound/soc/sof/intel/hda.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-)
sound/soc/intel/boards/skl_hda_dsp_generic.c +8 -0
@@ -100,6 +100,8 @@ static struct snd_soc_card hda_soc_card = { .late_probe = skl_hda_card_late_probe, }; +static char hda_soc_components[30 ]; +#define IDISP_DAI_COUNT 3#define HDAC_DAI_COUNT 2#define DMIC_DAI_COUNT 2
@@ -183,6 +185,12 @@ static int skl_hda_audio_probe(struct platform_device *pdev) hda_soc_card.dev = &pdev->dev;snd_soc_card_set_drvdata (&hda_soc_card, ctx); +if (mach->mach_params.dmic_num >0 ) { +snprintf (hda_soc_components,sizeof (hda_soc_components), +"cfg-dmics:%d" , mach->mach_params.dmic_num); + hda_soc_card.components = hda_soc_components; + } +return devm_snd_soc_register_card (&pdev->dev, &hda_soc_card); }
sound/soc/sof/intel/hda.c +2 -1
@@ -351,7 +351,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)const char *tplg_filename;const char *idisp_str;const char *dmic_str; -int dmic_num; +int dmic_num =0 ;int codec_num =0 ;int i;#endif
@@ -465,6 +465,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev) mach_params->codec_mask = bus->codec_mask; mach_params->platform =dev_name (sdev->dev); mach_params->common_hdmi_codec_drv = hda_codec_use_common_hdmi; + mach_params->dmic_num = dmic_num; }/* create codec instances */
Signature · 5 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 5 lines · Jaroslav Kysela
It is required for the auto-detection in the user space (for UCM).
Signed-off-by Jaroslav Kysela <[email protected]>Cc Pierre-Louis Bossart <[email protected]>Cc Mark Brown <[email protected]>
Thanks Jaroslav.
The changes are fine, but the code changes in hda.c will conflict with the cleanups done by Ranjani (which I was planning to send next week).
Any objections if we take this patch into the SOF tree (without changes to authorship) and provide it on alsa-devel next week with the cleanups, so that we don't have any conflicts?
Quoted 46 lines
--- sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 ++++++++ sound/soc/sof/intel/hda.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-)sound/soc/intel/boards/skl_hda_dsp_generic.c +8
-0@@ -100,6 +100,8 @@ static struct snd_soc_card hda_soc_card = { .late_probe = skl_hda_card_late_probe, }; +static char hda_soc_components[30 ]; +#define IDISP_DAI_COUNT 3#define HDAC_DAI_COUNT 2#define DMIC_DAI_COUNT 2@@ -183,6 +185,12 @@ static int skl_hda_audio_probe(struct platform_device *pdev) hda_soc_card.dev = &pdev->dev;snd_soc_card_set_drvdata (&hda_soc_card, ctx); +if (mach->mach_params.dmic_num >0 ) { +snprintf (hda_soc_components,sizeof (hda_soc_components), +"cfg-dmics:%d" , mach->mach_params.dmic_num); + hda_soc_card.components = hda_soc_components; + } +return devm_snd_soc_register_card (&pdev->dev, &hda_soc_card); }sound/soc/sof/intel/hda.c +1
-1@@ -351,7 +351,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)const char *tplg_filename;const char *idisp_str;const char *dmic_str; -int dmic_num; +int dmic_num =0 ;int codec_num =0 ;int i;#endif
sound/soc/sof/intel/hda.c static int hda_init_caps(struct snd_sof_dev *sdev) · line 471
Quoted 7 lines
sound/soc/sof/intel/hda.c +1
-0@@ -465,6 +465,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev) mach_params->codec_mask = bus->codec_mask; mach_params->platform =dev_name (sdev->dev); mach_params->common_hdmi_codec_drv = hda_codec_use_common_hdmi; + mach_params->dmic_num = dmic_num; }/* create codec instances */
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Jaroslav Kysela
maintainerDne 26. 11. 19 v 13:33 Pierre-Louis Bossart napsal(a):
Quoted 9 lines · Jaroslav Kysela
Quoted 5 lines
It is required for the auto-detection in the user space (for UCM).
Signed-off-by Jaroslav Kysela <[email protected]>Cc Pierre-Louis Bossart <[email protected]>Cc Mark Brown <[email protected]>
Quoted 7 lines
Thanks Jaroslav.
The changes are fine, but the code changes inhda.cwill conflict with the cleanups done by Ranjani (which I was planning to send next week).Any objections if we take this patch into the SOF tree (without changes to authorship) and provide it on alsa-devel next week with the cleanups, so that we don't have any conflicts?
I'm fine with that, if we don't miss the 5.5 merge window. Otherwise, you may rebase your changes on top. Mark?
Thank you,
Jaroslav
Quoted 54 lines
Quoted 54 lines
--- sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 ++++++++ sound/soc/sof/intel/hda.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-)sound/soc/intel/boards/skl_hda_dsp_generic.c +8
-0@@ -100,6 +100,8 @@ static struct snd_soc_card hda_soc_card = { .late_probe = skl_hda_card_late_probe, }; +static char hda_soc_components[30 ]; +#define IDISP_DAI_COUNT 3#define HDAC_DAI_COUNT 2#define DMIC_DAI_COUNT 2@@ -183,6 +185,12 @@ static int skl_hda_audio_probe(struct platform_device *pdev) hda_soc_card.dev = &pdev->dev;snd_soc_card_set_drvdata (&hda_soc_card, ctx); +if (mach->mach_params.dmic_num >0 ) { +snprintf (hda_soc_components,sizeof (hda_soc_components), +"cfg-dmics:%d" , mach->mach_params.dmic_num); + hda_soc_card.components = hda_soc_components; + } +return devm_snd_soc_register_card (&pdev->dev, &hda_soc_card); }sound/soc/sof/intel/hda.c +2
-1@@ -351,7 +351,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)const char *tplg_filename;const char *idisp_str;const char *dmic_str; -int dmic_num; +int dmic_num =0 ;int codec_num =0 ;int i;#endif @@ -465,6 +465,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev) mach_params->codec_mask = bus->codec_mask; mach_params->platform =dev_name (sdev->dev); mach_params->common_hdmi_codec_drv = hda_codec_use_common_hdmi; + mach_params->dmic_num = dmic_num; }/* create codec instances */
Signature · 6 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc. _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 14 lines · Jaroslav Kysela
Dne 26. 11. 19 v 13:33 Pierre-Louis Bossart napsal(a):
Quoted 13 lines · Jaroslav Kysela
Quoted 5 lines
It is required for the auto-detection in the user space (for UCM).
Signed-off-by Jaroslav Kysela <[email protected]>Cc Pierre-Louis Bossart <[email protected]>Cc Mark Brown <[email protected]>Thanks Jaroslav.
The changes are fine, but the code changes inhda.cwill conflict with the cleanups done by Ranjani (which I was planning to send next week).
Quoted 5 lines
Quoted 3 lines
Any objections if we take this patch into the SOF tree (without changes to authorship) and provide it on alsa-devel next week with the cleanups, so that we don't have any conflicts?
I'm fine with that, if we don't miss the 5.5 merge window. Otherwise, you may rebase your changes on top. Mark?
I just shared the changes, but I wasn't planning to see those changes in 5.5 since they are quite big, so if you want this in 5.5 I'll rebase.
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainerQuoted 8 lines · Jaroslav Kysela
Dne 26. 11. 19 v 13:33 Pierre-Louis Bossart napsal(a):
Quoted 3 lines
Any objections if we take this patch into the SOF tree (without changes to authorship) and provide it on alsa-devel next week with the cleanups, so that we don't have any conflicts?
I'm fine with that, if we don't miss the 5.5 merge window. Otherwise, you may rebase your changes on top. Mark?
You've missed the merge window already - it was open before this patch was sent.
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Jaroslav Kysela
maintainerDne 26. 11. 19 v 17:29 Mark Brown napsal(a):
Quoted 7 lines · Jaroslav Kysela
Quoted 5 lines
Dne 26. 11. 19 v 13:33 Pierre-Louis Bossart napsal(a):
Quoted 3 lines
Any objections if we take this patch into the SOF tree (without changes to authorship) and provide it on alsa-devel next week with the cleanups, so that we don't have any conflicts?
Quoted 5 lines
Quoted 2 lines
I'm fine with that, if we don't miss the 5.5 merge window. Otherwise, you may rebase your changes on top. Mark?
You've missed the merge window already - it was open before this patch was sent.
So, what now? Rebase on top of Pierre patches? You added another patches to your for-5.5 branch today.
I'd also merge the other two trivial component patches:
https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/thread.html#159158
Thanks,
Jaroslav
Signature · 6 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc. _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainerQuoted 7 lines · Jaroslav Kysela
Dne 26. 11. 19 v 17:29 Mark Brown napsal(a):
Quoted 2 lines
You've missed the merge window already - it was open before this patch was sent.
So, what now? Rebase on top of Pierre patches? You added another patches to your for-5.5 branch today.
Since Pierre seems happy with it even if he didn't ack it explicitly I'll guess I'll apply it. If git can figure out applying it after the merge window and it doesn't get negative reviews there's no need to resend. If it can't and it doesn't turn up in a bigger series before then I'll let you know.
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Jaroslav Kysela
maintainerDne 28. 11. 19 v 18:59 Mark Brown napsal(a):
Quoted 6 lines · Jaroslav Kysela
Quoted 4 lines
Dne 26. 11. 19 v 17:29 Mark Brown napsal(a):
Quoted 2 lines
You've missed the merge window already - it was open before this patch was sent.
Quoted 9 lines
Quoted 2 lines
So, what now? Rebase on top of Pierre patches? You added another patches to your for-5.5 branch today.
Since Pierre seems happy with it even if he didn't ack it explicitly I'll guess I'll apply it. If git can figure out applying it after the merge window and it doesn't get negative reviews there's no need to resend. If it can't and it doesn't turn up in a bigger series before then I'll let you know.
Thank you Mark.
Jaroslav
Signature · 6 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc. _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel