On 8/16/22 09:54, Sean Hong wrote:
This patch adds the driver data for rt5682 support jsl_rt5682_rt1019.
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 | 12 ++++++++++++ 2 files changed, 21 insertions(+)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 045965312..3a840f3a9 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 |
I see it's the same setting for all JSL devices but I am having doubts on this MCLK. Is this 24MHz value correct for JSL? It's derived from ICL so in theory the MCLK should be a multiple of 19.2MHz if the root frequency was the oscillator.
Is this intentional?
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 b95c4b2cd..e374bf163 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,13 @@ 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",.machine_quirk = snd_soc_acpi_codec_list,.quirk_data = &rt1019p_spk,.sof_tplg_filename = "sof-jsl-rt5682-rt1019.tplg",- }, { .id = "10134242", .drv_name = "jsl_cs4242_mx98360a",