ASoC: Intel: sof_rt5682: reorder quirk table
Subsystems (3)
PATCH v2 1/2 ASoC: Intel: sof_rt5682: reorder quirk table
From: Terry Cheong <[email protected]>
Reorder the entries in quirk table to group entries with same platform.
---
For the purpose of rebasing PATCH 2/2, pick up from
Mainly pick up mtl_rt1019_rt5682 driver for Chrome projects support.
Changes v2:
- missing Signed-off-by in PATCH 1/2, added it.
--- sound/soc/intel/boards/sof_rt5682.c | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-)
sound/soc/intel/boards/sof_rt5682.c +26 -26
@@ -981,14 +981,13 @@ static const struct platform_device_id board_ids[] = { .name = "sof_rt5682", }, { - .name = "tgl_mx98357_rt5682", + .name = "cml_rt1015_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | +SOF_RT5682_MCLK_24MHZ |SOF_RT5682_SSP_CODEC (0 ) |SOF_SPEAKER_AMP_PRESENT | -SOF_RT5682_SSP_AMP (1 ) | -SOF_RT5682_NUM_HDMIDEV (4 ) | -SOF_BT_OFFLOAD_SSP (2 ) | - SOF_SSP_BT_OFFLOAD_PRESENT), +SOF_RT1015_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(1)), }, { .name = "jsl_rt5682_rt1015",
@@ -1000,33 +999,38 @@ static const struct platform_device_id board_ids[] = { SOF_RT5682_SSP_AMP(1)), }, { - .name = "tgl_mx98373_rt5682", + .name = "jsl_rt5682_mx98360", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | +SOF_RT5682_MCLK_24MHZ |SOF_RT5682_SSP_CODEC (0 ) |SOF_SPEAKER_AMP_PRESENT | -SOF_MAX98373_SPEAKER_AMP_PRESENT | -SOF_RT5682_SSP_AMP (1 ) | -SOF_RT5682_NUM_HDMIDEV (4 ) | -SOF_BT_OFFLOAD_SSP (2 ) | - SOF_SSP_BT_OFFLOAD_PRESENT), +SOF_MAX98360A_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(1)), }, { - .name = "jsl_rt5682_mx98360", + .name = "jsl_rt5682_rt1015p", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |SOF_RT5682_MCLK_24MHZ |SOF_RT5682_SSP_CODEC (0 ) |SOF_SPEAKER_AMP_PRESENT | -SOF_MAX98360A_SPEAKER_AMP_PRESENT | +SOF_RT1015P_SPEAKER_AMP_PRESENT | SOF_RT5682_SSP_AMP(1)), }, { - .name = "cml_rt1015_rt5682", + .name = "jsl_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |SOF_RT5682_MCLK_24MHZ | + SOF_RT5682_SSP_CODEC(0)), + }, + { + .name = "tgl_mx98357_rt5682", + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |SOF_RT5682_SSP_CODEC (0 ) |SOF_SPEAKER_AMP_PRESENT | -SOF_RT1015_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1)), +SOF_RT5682_SSP_AMP (1 ) | +SOF_RT5682_NUM_HDMIDEV (4 ) | +SOF_BT_OFFLOAD_SSP (2 ) | + SOF_SSP_BT_OFFLOAD_PRESENT), }, { .name = "tgl_rt1011_rt5682",
@@ -1040,13 +1044,15 @@ static const struct platform_device_id board_ids[] = { SOF_SSP_BT_OFFLOAD_PRESENT), }, { - .name = "jsl_rt5682_rt1015p", + .name = "tgl_mx98373_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | -SOF_RT5682_MCLK_24MHZ |SOF_RT5682_SSP_CODEC (0 ) |SOF_SPEAKER_AMP_PRESENT | -SOF_RT1015P_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1)), +SOF_MAX98373_SPEAKER_AMP_PRESENT | +SOF_RT5682_SSP_AMP (1 ) | +SOF_RT5682_NUM_HDMIDEV (4 ) | +SOF_BT_OFFLOAD_SSP (2 ) | + SOF_SSP_BT_OFFLOAD_PRESENT), }, { .name = "adl_mx98373_rt5682",
@@ -1149,12 +1155,6 @@ static const struct platform_device_id board_ids[] = { SOF_RT5682_SSP_AMP(1) | SOF_RT5682_NUM_HDMIDEV(4)), }, - { - .name = "jsl_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | -SOF_RT5682_MCLK_24MHZ | - SOF_RT5682_SSP_CODEC(0)), - }, { } };MODULE_DEVICE_TABLE (platform, board_ids);
Signature · 1 line
2.20.1
PATCH v2 2/2 ASoC: Intel: sof_rt5682: Add mtl support RT1019P speaker
This patch support below hardware configuration:
SSP2: 10EC5682/RTL5682 codec
SSP0: RTL1019 amplifier
--- sound/soc/intel/boards/sof_rt5682.c | 23 +++++++++++++++++++ .../intel/common/soc-acpi-intel-mtl-match.c | 12 ++++++++++ 2 files changed, 35 insertions(+)
sound/soc/intel/boards/sof_rt5682.c +23 -0
@@ -239,6 +239,20 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {SOF_SSP_BT_OFFLOAD_PRESENT ), }, + { + .callback = sof_rt5682_quirk_cb, + .matches = { +DMI_MATCH (DMI_PRODUCT_FAMILY ,"Google_Rex" ), + DMI_MATCH(DMI_OEM_STRING, "AUDIO-ALC1019_ALC5682I_I2S"), + }, + .driver_data = (void *)(SOF_RT5682_MCLK_EN | +SOF_RT5682_SSP_CODEC (2 ) | +SOF_SPEAKER_AMP_PRESENT | +SOF_RT1019_SPEAKER_AMP_PRESENT | +SOF_RT5682_SSP_AMP (0 ) | +SOF_RT5682_NUM_HDMIDEV (3 ) + ), + }, { .callback = sof_rt5682_quirk_cb, .matches = {
@@ -1155,6 +1169,15 @@ static const struct platform_device_id board_ids[] = {SOF_RT5682_SSP_AMP (1 ) | SOF_RT5682_NUM_HDMIDEV(4)), }, + { + .name = "mtl_rt1019_rt5682", + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | +SOF_RT5682_SSP_CODEC (2 ) | +SOF_SPEAKER_AMP_PRESENT | +SOF_RT1019_SPEAKER_AMP_PRESENT | +SOF_RT5682_SSP_AMP (0 ) | + SOF_RT5682_NUM_HDMIDEV(3)), + }, { } };MODULE_DEVICE_TABLE (platform, board_ids);
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +12 -0
@@ -20,6 +20,11 @@ static const struct snd_soc_acpi_codecs mtl_max98360a_amp = { .codecs = {"MX98360A"} }; +static const struct snd_soc_acpi_codecs mtl_rt1019p_amp = { + .num_codecs =1 , + .codecs = {"RTL1019" } +}; +static const struct snd_soc_acpi_codecs mtl_rt5682_rt5682s_hp = { .num_codecs =2 , .codecs = {"10EC5682" ,"RTL5682" },
@@ -40,6 +45,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = { .quirk_data = &mtl_max98360a_amp, .sof_tplg_filename = "sof-mtl-max98360a-rt5682.tplg", }, + { + .comp_ids = &mtl_rt5682_rt5682s_hp, + .drv_name = "mtl_rt1019_rt5682", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &mtl_rt1019p_amp, + .sof_tplg_filename = "sof-mtl-rt1019-rt5682.tplg", + }, {}, };EXPORT_SYMBOL_GPL (snd_soc_acpi_intel_mtl_machines);
Signature · 1 line
2.20.1
Mark Brown
maintainerQuoted 3 lines · Mac Chiang
Reorder the entries in quirk table to group entries with same platform.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: Intel: sof_rt5682: reorder quirk table
commit: 1f583cbdc342e15bfbde61ba142480c70e7694b4
[2/2] ASoC: Intel: sof_rt5682: Add mtl support RT1019P speaker
commit: b20c81371a96b87478d2430d80615df189d17cd8All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark