ASoC: Intel: sof_rt5682: add jsl_rt5650 board config
Subsystems (3)
PATCH v3 1/1 ASoC: Intel: sof_rt5682: add jsl_rt5650 board config
This configuration supports JSL boards which implement ALC5650 dual I2S interface codec. Two DAI links are added: AIF1 (on codec side) for headphone and AIF2 for speakers.
--- sound/soc/intel/boards/Kconfig | 5 +- sound/soc/intel/boards/sof_rt5682.c | 80 ++++++++++++++++++- .../intel/common/soc-acpi-intel-jsl-match.c | 12 +++ 3 files changed, 93 insertions(+), 4 deletions(-)
sound/soc/intel/boards/Kconfig +3 -2
@@ -475,7 +475,7 @@ endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC if SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL config SND_SOC_INTEL_SOF_RT5682_MACH - tristate "SOF with rt5682 codec in I2S Mode" + tristate "SOF with rt5650/rt5682 codec in I2S Mode" depends on I2C && ACPI depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\ (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
@@ -485,6 +485,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH select SND_SOC_RT1011 select SND_SOC_RT1015 select SND_SOC_RT1015P + select SND_SOC_RT5645 select SND_SOC_RT5682_I2C select SND_SOC_RT5682S select SND_SOC_DMIC
@@ -494,7 +495,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH select SND_SOC_INTEL_SOF_REALTEK_COMMON help This adds support for ASoC machine driver for SOF platforms - with rt5682 codec. + with rt5650 or rt5682 codec. Say Y if you have such a device. If unsure select "N".
sound/soc/intel/boards/sof_rt5682.c +78 -2
169 lines not on this page · raw message
sound/soc/intel/common/soc-acpi-intel-jsl-match.c +12 -0
@@ -34,6 +34,11 @@ static const struct snd_soc_acpi_codecs mx98360a_spk = { .codecs = {"MX98360A"} }; +static struct snd_soc_acpi_codecs rt5650_spk = { + .num_codecs =1 , + .codecs = {"10EC5650" } +}; +static const struct snd_soc_acpi_codecs rt5682_rt5682s_hp = { .num_codecs =2 , .codecs = {"10EC5682" ,"RTL5682" },
@@ -98,6 +103,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, }, + { + .id = "10EC5650", + .drv_name = "jsl_rt5650", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rt5650_spk, + .sof_tplg_filename = "sof-jsl-rt5650-dual.tplg", + }, {}, };EXPORT_SYMBOL_GPL (snd_soc_acpi_intel_jsl_machines);
Signature · 1 line
2.34.1
sound/soc/intel/common/soc-acpi-intel-jsl-match.c struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { · line 111
Quoted 7 lines
sound/soc/intel/common/soc-acpi-intel-jsl-match.c +6
-0+ { + .id = "10EC5650", + .drv_name = "jsl_rt5650", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rt5650_spk, + .sof_tplg_filename = "sof-jsl-rt5650-dual.tplg",
what does 'dual' mean in this context? it's not something we've used before so a comment would be needed IMHO.
two DAIs, two codecs?
Quoted 11 lines
sound/soc/intel/common/soc-acpi-intel-jsl-match.c struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { · line 111
Quoted 6 lines
sound/soc/intel/common/soc-acpi-intel-jsl-match.c +6
-0+ { + .id = "10EC5650", + .drv_name = "jsl_rt5650", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rt5650_spk, + .sof_tplg_filename = "sof-jsl-rt5650-dual.tplg",what does 'dual' mean in this context? it's not something we've used before so a comment would be needed IMHO.
two DAIs, two codecs?
Dual I2S. Should we remove it? Just sof-jsl-rt5650.tplg?
Regards,
Brent
Quoted 10 lines · Brent
Quoted 10 lines
sound/soc/intel/common/soc-acpi-intel-jsl-match.c struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { · line 111
Quoted 6 lines
sound/soc/intel/common/soc-acpi-intel-jsl-match.c +6
-0+ { + .id = "10EC5650", + .drv_name = "jsl_rt5650", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rt5650_spk, + .sof_tplg_filename = "sof-jsl-rt5650-dual.tplg",what does 'dual' mean in this context? it's not something we've used before so a comment would be needed IMHO.
Quoted 3 lines
Quoted 1 line
two DAIs, two codecs?
Dual I2S. Should we remove it? Just sof-jsl-rt5650.tplg?
that would be my preference, we have lots of configurations with 2 I2S and never mention it in the topology file name. 'dual' sounds more confusing than helping here.
The rest of the patch is fine.
Quoted 6 lines
that would be my preference, we have lots of configurations with 2 I2S and never mention it in the topology file name. 'dual' sounds more confusing than helping here.
The rest of the patch is fine.
Will fix it in v4 patch. Thanks for review.
Regards,
Brent