ACK: [SRU][Focal][OEM-5.6][Groovy][PATCH 1/1] UBUNTU: SAUCE: ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics

[Stefan Bader]

On 14.08.20 07:39, Hui Wang wrote:
> From: Jaska Uimonen <jaska.uimonen at linux.intel.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1891585
> 
> Currently the dmic check code supports only devices with 2 or 4 dmics.
> With other dmic counts the function will return 0. Lately we've seen
> devices with only 1 dmic thus enable also configurations with 1, and
> possibly 3, dmics. Add also topology postfix -1ch and -3ch for new dmic
> configuration.
> 
> Signed-off-by: Jaska Uimonen <jaska.uimonen at linux.intel.com>
> (Cherry picked from b38e6b9033485f7e662f3a0067fae0ee560c11e4
> git://github.com/thesofproject/linux.git)
> Signed-off-by: Hui Wang <hui.wang at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---

With additional clarification in this thread.

>  sound/soc/sof/intel/hda.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
> index d051d0b45168..a61218381119 100644
> --- a/sound/soc/sof/intel/hda.c
> +++ b/sound/soc/sof/intel/hda.c
> @@ -544,7 +544,7 @@ static int check_nhlt_dmic(struct snd_sof_dev *sdev)
>  	if (nhlt) {
>  		dmic_num = intel_nhlt_get_dmic_geo(sdev->dev, nhlt);
>  		intel_nhlt_free(nhlt);
> -		if (dmic_num == 2 || dmic_num == 4)
> +		if (dmic_num >= 1 && dmic_num <= 4)
>  			return dmic_num;
>  	}
>  
> @@ -992,9 +992,15 @@ static int hda_generic_machine_select(struct snd_sof_dev *sdev)
>  				dmic_num = hda_dmic_num;
>  
>  			switch (dmic_num) {
> +			case 1:
> +				dmic_str = "-1ch";
> +				break;
>  			case 2:
>  				dmic_str = "-2ch";
>  				break;
> +			case 3:
> +				dmic_str = "-3ch";
> +				break;
>  			case 4:
>  				dmic_str = "-4ch";
>  				break;
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20200814/b9e6f3a4/attachment.sig>