Skip to contentSkip to conversation

ALSA: hda: intel-dsp-config: add JasperLake support

PATCH Superseded Brent Lu 3 participants 6 messages Dec 1, 2021 – Jan 13, 2022 Sound

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Brent Lu

author
#0 lore raw

PATCH 1/1 ALSA: hda: intel-dsp-config: add JasperLake support

Add rules to select SOF driver for Jasper Lake systems if digital microphone is present or the system is a Chromebook.

---
 sound/hda/intel-dsp-config.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
sound/hda/intel-dsp-config.c +21 -0
index b9ac9e9e45a4..be47a1ca12b6 100644
@@ -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)
 	{
Signature · 1 line
2.25.1
#1 lore raw
Quoted 2 lines · Brent Lu

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!

Quoted 39 lines
---
 sound/hda/intel-dsp-config.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
sound/hda/intel-dsp-config.c +21 -0
index b9ac9e9e45a4..be47a1ca12b6 100644
@@ -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)
 	{
#2 lore raw
Quoted 7 lines · Pierre-Louis Bossart
Quoted 2 lines · Brent Lu

Add rules to select SOF driver for Jasper Lake systems if digital microphone is present or the system is a Chromebook.

Quoted 6 lines

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.

Quoted 11 lines
sound/hda/intel-dsp-config.c +8 -0
+/* 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

Quoted 43 lines

Thanks!

Quoted 39 lines
---
 sound/hda/intel-dsp-config.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
sound/hda/intel-dsp-config.c +21 -0
index b9ac9e9e45a4..be47a1ca12b6 100644
@@ -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)
 	{
author
#3 lore raw
Quoted 19 lines
Quoted 7 lines

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.

Quoted 9 lines
sound/hda/intel-dsp-config.c +8 -0
+/* JasperLake */
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)
+	{
+		.flags = FLAG_SOF,
+		.device = 0x4dc8,
+		.codec_hid = "ESSX8336",
+	},
+#endif
Quoted 6 lines
Quoted 2 lines

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

#4 lore raw
Quoted 28 lines · Brent
Quoted 20 lines
Quoted 8 lines

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.

Quoted 9 lines
sound/hda/intel-dsp-config.c +8 -0
+/* JasperLake */
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)
+	{
+		.flags = FLAG_SOF,
+		.device = 0x4dc8,
+		.codec_hid = "ESSX8336",
+	},
+#endif
Quoted 6 lines
Quoted 2 lines

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,

Quoted 7 lines

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

author
#5 lore raw
Quoted 6 lines
Quoted 6 lines

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?

Quoted 8 lines
Quoted 5 lines

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.

Quoted 8 lines

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