| Message ID | 20220812114804.550809-1-sean.hong@quanta.corp-partner.google.com |
|---|---|
| State | New |
| Headers | show |
| Series | ASoC: Intel: sof_rt5682: Add support for jsl_rt5682_rt1019 | expand |
> static const struct snd_soc_acpi_codecs mx98360a_spk = { > .num_codecs = 1, > .codecs = {"MX98360A"} > @@ -78,6 +83,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { > .quirk_data = &mx98360a_spk, > .sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg", > }, > + { > + .comp_ids = &rt5682_rt5682s_hp, > + .drv_name = "jsl_rt5682_rt1019", > + .sof_fw_filename = "sof-jsl.ri", > + .machine_quirk = snd_soc_acpi_codec_list, > + .quirk_data = &rt1019p_spk, > + .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg", this patch adds support for the rt1019, the line above looks like a copy-paste mistake. We shouldn't use the same topology files for different platforms, it's not good maintenance-wise and since we store default values for some controls it's really not a good idea. Please use a unique string such as sof-jsl-rt5682-rt1019.tplg, thanks. > + }, > { > .id = "10134242", > .drv_name = "jsl_cs4242_mx98360a",
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 045965312245b..3a840f3a9f5d2 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -1100,6 +1100,15 @@ static const struct platform_device_id board_ids[] = { SOF_RT5682_SSP_AMP(1) | SOF_RT5682_NUM_HDMIDEV(4)), }, + { + .name = "jsl_rt5682_rt1019", + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | + SOF_RT5682_MCLK_24MHZ | + SOF_RT5682_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_RT1019_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(1)), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c index b95c4b2cda947..139d2468f5f70 100644 --- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c @@ -29,6 +29,11 @@ static const struct snd_soc_acpi_codecs rt1015p_spk = { .codecs = {"RTL1015"} }; +static struct snd_soc_acpi_codecs rt1019p_spk = { + .num_codecs = 1, + .codecs = {"RTL1019"} +} + static const struct snd_soc_acpi_codecs mx98360a_spk = { .num_codecs = 1, .codecs = {"MX98360A"} @@ -78,6 +83,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { .quirk_data = &mx98360a_spk, .sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg", }, + { + .comp_ids = &rt5682_rt5682s_hp, + .drv_name = "jsl_rt5682_rt1019", + .sof_fw_filename = "sof-jsl.ri", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rt1019p_spk, + .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg", + }, { .id = "10134242", .drv_name = "jsl_cs4242_mx98360a",
This patch adds the driver data for rt5682s on SSP0 for ADL platform Signed-off-by: Sean Hong <sean.hong@quanta.corp-partner.google.com> --- sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++ sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 13 +++++++++++++ 2 files changed, 22 insertions(+)