Date:   Wed, 01 Dec 2021 07:44:21 +0100
Message-ID: <s5hsfvczuwq.wl-tiwai@suse.de>
From:   Takashi Iwai <tiwai@suse.de>
To:     Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc:     Brent Lu <brent.lu@intel.com>, alsa-devel@alsa-project.org,
        Hans de Goede <hdegoede@redhat.com>,
        Bard Liao <bard.liao@intel.com>, linux-kernel@vger.kernel.org,
        Kai Vehmanen <kai.vehmanen@linux.intel.com>,
        Takashi Iwai <tiwai@suse.com>
Subject: Re: [PATCH] ALSA: hda: intel-dsp-config: add JasperLake support
In-Reply-To: <4e0ec119-2b15-644d-9cab-b2e19b5c0e48@linux.intel.com>
References: <20211201004628.1153763-1-brent.lu@intel.com>
        <4e0ec119-2b15-644d-9cab-b2e19b5c0e48@linux.intel.com>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk

On Wed, 01 Dec 2021 03:32:39 +0100,
Pierre-Louis Bossart wrote:
> 
> 
> 
> On 11/30/21 6:46 PM, Brent Lu wrote:
> > Add rules to select SOF driver for Jasper Lake systems if digital
> > microphone is present or the system is a Chromebook.
> 
> Thanks Brent, yes this is an oversight, we should have added this a long
> time ago.
> 
> I don't think however that this will apply on Takashi's for-next branch,
> it'll conflict with the ALSA: intel-dsp-config: add quirk for JSL
> devices based on ES8336 codec

Actually it's for-linus branch, destined to 5.16-rc4.

> +/* JasperLake */
> +#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)
> +	{
> +		.flags = FLAG_SOF,
> +		.device = 0x4dc8,
> +		.codec_hid = "ESSX8336",
> +	},
> +#endif
> 
> Do you mind rebasing and resending the update? Let's keep the ESS stuff
> last as done in other platforms, and add your changes on top of this.

Yes, please resubmit.  I can merge and resolve the conflict in my
side, but it's better to get a cleaner patch from the beginning.


thanks,

Takashi

> 
> Thanks!
> 
> > 
> > Signed-off-by: Brent Lu <brent.lu@intel.com>
> > ---
> >  sound/hda/intel-dsp-config.c | 21 +++++++++++++++++++++
> >  1 file changed, 21 insertions(+)
> > 
> > diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
> > index b9ac9e9e45a4..be47a1ca12b6 100644
> > --- a/sound/hda/intel-dsp-config.c
> > +++ b/sound/hda/intel-dsp-config.c
> > @@ -299,6 +299,27 @@ static const struct config_entry config_table[] = {
> >  	},
> >  #endif
> >  
> > +/* Jasper Lake */
> > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)
> > +	{
> > +		.flags = FLAG_SOF,
> > +		.device = 0x4dc8,
> > +		.dmi_table = (const struct dmi_system_id []) {
> > +			{
> > +				.ident = "Google Chromebooks",
> > +				.matches = {
> > +					DMI_MATCH(DMI_SYS_VENDOR, "Google"),
> > +				}
> > +			},
> > +			{}
> > +		}
> > +	},
> > +	{
> > +		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
> > +		.device = 0x4dc8,
> > +	},
> > +#endif
> > +
> >  /* Tigerlake */
> >  #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)
> >  	{
> > 
>