| Message ID | 20200918161533.166533-1-pierre-louis.bossart@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics | expand |
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 :(
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?
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
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!
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;