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
Date: Thu, 02 Dec 2021 09:27:59 +0100 [thread overview]
Message-ID: <s5h4k7rwgvk.wl-tiwai@suse.de> (raw)
In-Reply-To: <SA2PR11MB489124ED42353956827A2EC597699@SA2PR11MB4891.namprd11.prod.outlook.com>
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
next prev parent reply other threads:[~2021-12-02 8:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 0:46 Brent Lu
2021-12-01 2:32 ` Pierre-Louis Bossart
2021-12-01 6:44 ` Takashi Iwai
2021-12-02 8:15 ` Lu, Brent
2021-12-02 8:27 ` Takashi Iwai [this message]
2022-01-13 10:57 ` Lu, Brent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5h4k7rwgvk.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=bard.liao@intel.com \
--cc=brent.lu@intel.com \
--cc=hdegoede@redhat.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®