[PATCH v2 0/2] ALSA: hda: intel-dsp-config: add JasperLake support
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(-)
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 */
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
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
participants (2)
-
Brent Lu -
Takashi Iwai