[PATCH] ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics

[PATCH] ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics

[Pierre-Louis Bossart]

From: Jaska Uimonen <jaska.uimonen@linux.intel.com>

[ Backported from Upstream commit 3dca35e35b42b3405ddad7ee95c02a2d8cf28592]

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@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200825235040.1586478-4-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---

Note to -stable maintainers:

The Upstream commit 3dca35e35b42b3405ddad7ee95c02a2d8cf28592 can be
cherry-picked as is for kernel 5.6+. For kernel 5.4 and 5.5, the
backport provided in this patch is required (same functionality,
different location). Let me know in case I missed required information
(tags, etc).

 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 91bd88fddac7..a3465e857c59 100644
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -305,7 +305,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;
 	}
 
@@ -442,9 +442,15 @@ static int hda_init_caps(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;
-- 
2.25.1

Re: [PATCH] ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics

[Greg KH]

On Fri, Sep 18, 2020 at 11:15:33AM -0500, Pierre-Louis Bossart wrote:
> From: Jaska Uimonen <jaska.uimonen@linux.intel.com>
> 
> [ Backported from Upstream commit 3dca35e35b42b3405ddad7ee95c02a2d8cf28592]

There is no such commit in Linus's tree :(

Re: [PATCH] ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics

[Pierre-Louis Bossart]

On 9/21/20 11:10 AM, Greg KH wrote:
> On Fri, Sep 18, 2020 at 11:15:33AM -0500, Pierre-Louis Bossart wrote:
>> From: Jaska Uimonen <jaska.uimonen@linux.intel.com>
>>
>> [ Backported from Upstream commit 3dca35e35b42b3405ddad7ee95c02a2d8cf28592]
> 
> There is no such commit in Linus's tree :(

no such commit yet, it's in Mark Brown's tree and should be in 5.10

https://lore.kernel.org/alsa-devel/20200825235040.1586478-4-ranjani.sridharan@linux.intel.com/

I must admit I didn't know how to tweak the information between brackets.

do you want me to remove the 'Upstream' comment and resend?

Re: [PATCH] ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics

[Greg KH]

On Mon, Sep 21, 2020 at 11:18:47AM -0500, Pierre-Louis Bossart wrote:
> 
> 
> On 9/21/20 11:10 AM, Greg KH wrote:
> > On Fri, Sep 18, 2020 at 11:15:33AM -0500, Pierre-Louis Bossart wrote:
> > > From: Jaska Uimonen <jaska.uimonen@linux.intel.com>
> > > 
> > > [ Backported from Upstream commit 3dca35e35b42b3405ddad7ee95c02a2d8cf28592]
> > 
> > There is no such commit in Linus's tree :(
> 
> no such commit yet, it's in Mark Brown's tree and should be in 5.10
> 
> https://lore.kernel.org/alsa-devel/20200825235040.1586478-4-ranjani.sridharan@linux.intel.com/
> 
> I must admit I didn't know how to tweak the information between brackets.
> 
> do you want me to remove the 'Upstream' comment and resend?

I can't take anything that is not already in Linus's tree, so we need to
wait until it hits there, right?

thanks,

greg k-h

Re: [PATCH] ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics

[Pierre-Louis Bossart]

On 9/21/20 11:21 AM, Greg KH wrote:
> On Mon, Sep 21, 2020 at 11:18:47AM -0500, Pierre-Louis Bossart wrote:
>>
>>
>> On 9/21/20 11:10 AM, Greg KH wrote:
>>> On Fri, Sep 18, 2020 at 11:15:33AM -0500, Pierre-Louis Bossart wrote:
>>>> From: Jaska Uimonen <jaska.uimonen@linux.intel.com>
>>>>
>>>> [ Backported from Upstream commit 3dca35e35b42b3405ddad7ee95c02a2d8cf28592]
>>>
>>> There is no such commit in Linus's tree :(
>>
>> no such commit yet, it's in Mark Brown's tree and should be in 5.10
>>
>> https://lore.kernel.org/alsa-devel/20200825235040.1586478-4-ranjani.sridharan@linux.intel.com/
>>
>> I must admit I didn't know how to tweak the information between brackets.
>>
>> do you want me to remove the 'Upstream' comment and resend?
> 
> I can't take anything that is not already in Linus's tree, so we need to
> wait until it hits there, right?

no worries. Will resend this after 5.10-rc1, thanks!