* [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support
@ 2022-01-13 10:52 Brent Lu
2022-01-13 10:52 ` [PATCH v2 1/2] " Brent Lu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Brent Lu @ 2022-01-13 10:52 UTC (permalink / raw)
To: alsa-devel
Cc: Jaroslav Kysela, Takashi Iwai, Pierre-Louis Bossart,
Kai Vehmanen, Bard Liao, Brent Lu, Hans de Goede,
Amadeusz Sławiński, linux-kernel
Support JasperLake Chromebooks and fix a order issue in config table.
v2:
- rebase to Takashi's tree
- add a fix for config table
*** BLURB HERE ***
Brent Lu (2):
ALSA: hda: intel-dsp-config: add JasperLake support
ALSA: hda: intel-dsp-config: reorder the config table
sound/hda/intel-dsp-config.c | 43 +++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 13 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] ALSA: hda: intel-dsp-config: add JasperLake support
2022-01-13 10:52 [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support Brent Lu
@ 2022-01-13 10:52 ` Brent Lu
2022-01-13 10:52 ` [PATCH v2 2/2] ALSA: hda: intel-dsp-config: reorder the config table Brent Lu
2022-01-13 12:22 ` [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support Takashi Iwai
2 siblings, 0 replies; 4+ messages in thread
From: Brent Lu @ 2022-01-13 10:52 UTC (permalink / raw)
To: alsa-devel
Cc: Jaroslav Kysela, Takashi Iwai, Pierre-Louis Bossart,
Kai Vehmanen, Bard Liao, Brent Lu, Hans de Goede,
Amadeusz Sławiński, linux-kernel
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 | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index c26229ed642f..3a3026fa4a17 100644
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -309,13 +309,30 @@ static const struct config_entry config_table[] = {
},
#endif
-/* JasperLake */
+/* 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,
.device = 0x4dc8,
.codec_hid = "ESSX8336",
},
+ {
+ .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
+ .device = 0x4dc8,
+ },
#endif
/* Tigerlake */
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] ALSA: hda: intel-dsp-config: reorder the config table
2022-01-13 10:52 [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support Brent Lu
2022-01-13 10:52 ` [PATCH v2 1/2] " Brent Lu
@ 2022-01-13 10:52 ` Brent Lu
2022-01-13 12:22 ` [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support Takashi Iwai
2 siblings, 0 replies; 4+ messages in thread
From: Brent Lu @ 2022-01-13 10:52 UTC (permalink / raw)
To: alsa-devel
Cc: Jaroslav Kysela, Takashi Iwai, Pierre-Louis Bossart,
Kai Vehmanen, Bard Liao, Brent Lu, Hans de Goede,
Amadeusz Sławiński, linux-kernel
Entries without dmi_table nor codec_hid field need to be placed after
entries with these two fields or they will be always selected.
Signed-off-by: Brent Lu <brent.lu@intel.com>
---
sound/hda/intel-dsp-config.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index 3a3026fa4a17..4fb90ceb4053 100644
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -249,13 +249,13 @@ static const struct config_entry config_table[] = {
}
},
{
- .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+ .flags = FLAG_SOF,
.device = 0x02c8,
+ .codec_hid = "ESSX8336",
},
{
- .flags = FLAG_SOF,
+ .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
.device = 0x02c8,
- .codec_hid = "ESSX8336",
},
/* Cometlake-H */
{
@@ -278,14 +278,14 @@ static const struct config_entry config_table[] = {
}
},
{
- .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
- .device = 0x06c8,
- },
- {
.flags = FLAG_SOF,
.device = 0x06c8,
.codec_hid = "ESSX8336",
},
+ {
+ .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+ .device = 0x06c8,
+ },
#endif
/* Icelake */
@@ -351,17 +351,17 @@ static const struct config_entry config_table[] = {
}
},
{
- .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+ .flags = FLAG_SOF,
.device = 0xa0c8,
+ .codec_hid = "ESSX8336",
},
{
.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
- .device = 0x43c8,
+ .device = 0xa0c8,
},
{
- .flags = FLAG_SOF,
- .device = 0xa0c8,
- .codec_hid = "ESSX8336",
+ .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+ .device = 0x43c8,
},
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support
2022-01-13 10:52 [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support Brent Lu
2022-01-13 10:52 ` [PATCH v2 1/2] " Brent Lu
2022-01-13 10:52 ` [PATCH v2 2/2] ALSA: hda: intel-dsp-config: reorder the config table Brent Lu
@ 2022-01-13 12:22 ` Takashi Iwai
2 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2022-01-13 12:22 UTC (permalink / raw)
To: Brent Lu
Cc: alsa-devel, Jaroslav Kysela, Takashi Iwai, Pierre-Louis Bossart,
Kai Vehmanen, Bard Liao, Hans de Goede,
Amadeusz Sławiński, linux-kernel
On Thu, 13 Jan 2022 11:52:18 +0100,
Brent Lu wrote:
>
> Support JasperLake Chromebooks and fix a order issue in config table.
>
> v2:
> - rebase to Takashi's tree
> - add a fix for config table
>
> *** BLURB HERE ***
>
> Brent Lu (2):
> ALSA: hda: intel-dsp-config: add JasperLake support
> ALSA: hda: intel-dsp-config: reorder the config table
Applied both patches now. Thanks.
Takashi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-13 12:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-13 10:52 [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support Brent Lu
2022-01-13 10:52 ` [PATCH v2 1/2] " Brent Lu
2022-01-13 10:52 ` [PATCH v2 2/2] ALSA: hda: intel-dsp-config: reorder the config table Brent Lu
2022-01-13 12:22 ` [PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).