Date:   Thu, 02 Dec 2021 09:27:59 +0100
Message-ID: <s5h4k7rwgvk.wl-tiwai@suse.de>
From:   Takashi Iwai <tiwai@suse.de>
To:     "Lu, Brent" <brent.lu@intel.com>
Cc:     Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
        "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
        Hans de Goede <hdegoede@redhat.com>,
        "Liao, Bard" <bard.liao@intel.com>,
        "linux-kernel@vger.kernel.org" <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: <SA2PR11MB489124ED42353956827A2EC597699@SA2PR11MB4891.namprd11.prod.outlook.com>
References: <20211201004628.1153763-1-brent.lu@intel.com>
        <4e0ec119-2b15-644d-9cab-b2e19b5c0e48@linux.intel.com>
        <s5hsfvczuwq.wl-tiwai@suse.de>
        <SA2PR11MB489124ED42353956827A2EC597699@SA2PR11MB4891.namprd11.prod.outlook.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 Thu, 02 Dec 2021 09:15:37 +0100,
Lu, Brent wrote:
> 
> > >
> > > 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.
> > 
> Hi gentlement,
> 
> I found following two patches in sof github do not exist in both broonie:for-next
> and broonie:for-linus. Maybe it would be easier if I resubmit my patch to sof
> github instead of alsa-dev?
> 
> sof: topic/sof-dev
> 986f58741d0d ALSA: intel-dsp-config: add quirk for CML devices based on ES8336 codec
> 2cccdf5b4414 ALSA: intel-dsp-config: add quirk for JSL devices based on ES8336 codec

You'll need to rebase to the target tree, i.e. my sound.git tree in
this case, as it's not directly about ASoC.

Mark will need to sync his tree eventually later, but for this
particular patch, just use my tree (for-linus branch) as the base or
use linux-next tree.


thanks,

Takashi