| Message ID | 20211201004628.1153763-1-brent.lu@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: hda: intel-dsp-config: add JasperLake support | expand |
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 +/* 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. 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) > { >
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) > > { > > >
> > > > 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 Regards, Brent
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
> > 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. Sorry I forgot this mail. A v2 patch is sent to rebased on the right tree and on top of ES8336 changes. > > 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
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) {
Add rules to select SOF driver for Jasper Lake systems if digital microphone is present or the system is a Chromebook. Signed-off-by: Brent Lu <brent.lu@intel.com> --- sound/hda/intel-dsp-config.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)