ASoC: Intel: machine driver updates for 6.19
Subsystems (3)
Bard Liao
maintainercover ASoC: Intel: machine driver updates for 6.19
Add supports for new audio configurations on Intel platforms.
Bard Liao (1):
ASoC: Intel: sof_sdw: create BT dai link if bt_link_mask is set
Mac Chiang (4):
ASoC: Intel: soc-acpi-intel-ptl-match: Add support for
rt722_l0_rt1320_l23
ASoC: Intel: sof_sdw: Add quirk to exclude RT722 speaker
ASoC: Intel: soc-acpi-ptl-match: add cs42l43_agg_l3_cs35l56_2 support
ASoC: Intel: sof_sdw: add codec speaker support for the SKU
Peter Ujfalusi (1):
ASOC: Intel: sof_sdw: add quirk for Avell B.ON (OEM rebranded NUC15)
sound/soc/intel/boards/sof_sdw.c | 59 ++++++++++++-- .../intel/common/soc-acpi-intel-ptl-match.c | 79 +++++++++++++++++++ 2 files changed, 130 insertions(+), 8 deletions(-)
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH 1/6 ASoC: Intel: soc-acpi-intel-ptl-match: Add support for rt722_l0_rt1320_l23
From: Mac Chiang <[email protected]>
This patch adds support for the RT722 codec on SoundWire link 0, and RT1320 left and right amplifiers on links 2 and 3, respectively.
--- .../intel/common/soc-acpi-intel-ptl-match.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)
sound/soc/intel/common/soc-acpi-intel-ptl-match.c +35 -0
@@ -422,6 +422,15 @@ static const struct snd_soc_acpi_adr_device rt1320_2_group2_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt1320_2_group2_l_adr[] = { + { + .adr =0x000230025D132001ull , + .num_endpoints =1 , + .endpoints = &spk_l_endpoint, + .name_prefix ="rt1320-1" + } +}; +static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = { { .adr =0x000330025D132001ull ,
@@ -486,6 +495,25 @@ static const struct snd_soc_acpi_link_adr ptl_rt722_l3[] = { {} }; +static const struct snd_soc_acpi_link_adr ptl_rt722_l0_rt1320_l23[] = { + { + .mask =BIT (0 ), + .num_adr =ARRAY_SIZE (rt722_0_single_adr), + .adr_d = rt722_0_single_adr, + }, + { + .mask =BIT (2 ), + .num_adr =ARRAY_SIZE (rt1320_2_group2_l_adr), + .adr_d = rt1320_2_group2_l_adr, + }, + { + .mask =BIT (3 ), + .num_adr =ARRAY_SIZE (rt1320_3_group2_adr), + .adr_d = rt1320_3_group2_adr, + }, + {} +}; +static const struct snd_soc_acpi_link_adr ptl_rvp[] = { { .mask =BIT (0 ),
@@ -624,6 +652,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-ptl-cs42l43-l2-cs35l56x6-l13.tplg", }, + { + .link_mask = BIT(0) | BIT(2) | BIT(3), + .links = ptl_rt722_l0_rt1320_l23, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-ptl-rt722-l0-rt1320-l23.tplg", + .get_function_tplg_files = sof_sdw_get_tplg_files, + }, { .link_mask = BIT(1) | BIT(2), .links = ptl_sdw_rt712_vb_l2_rt1320_l1,
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH 2/6 ASoC: Intel: sof_sdw: Add quirk to exclude RT722 speaker
In reply to Bard LiaoFrom: Mac Chiang <[email protected]>
This SKU does not use the RT722 internal speaker. Add SOC_SDW_CODEC_SPKR to prevent DAI being created via codec_info_list.dais.quirk_exclude.
Other SKUs continue to check higher-priority sdca_functions when the BIOS SDCA property is present.
--- sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/soc/intel/boards/sof_sdw.c +11 -0
@@ -757,6 +757,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { }, .driver_data = (void *)(SOC_SDW_PCH_DMIC), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Google" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Francka"), + }, + .driver_data = (void *)(SOC_SDW_CODEC_SPKR | +SOC_SDW_PCH_DMIC | +SOF_BT_OFFLOAD_SSP (2 ) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { .callback = sof_sdw_quirk_cb, .matches = {
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH 3/6 ASOC: Intel: sof_sdw: add quirk for Avell B.ON (OEM rebranded NUC15)
In reply to Bard LiaoFrom: Peter Ujfalusi <[email protected]>
Avell B.ON is an OEM re-branded NUC15 'Bishop County' LAPBC510 and LAPBC710.
--- sound/soc/intel/boards/sof_sdw.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
sound/soc/intel/boards/sof_sdw.c +14 -0
@@ -230,6 +230,20 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {SOC_SDW_PCH_DMIC | RT711_JD1), }, + { +/* +* Avell B.ON (OEM rebrand of NUC15 'Bishop County' LAPBC510 and +* LAPBC710) +*/ + .callback = sof_sdw_quirk_cb, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Avell High Performance" ), + DMI_MATCH(DMI_PRODUCT_NAME, "B.ON"), + }, + .driver_data = (void *)(SOF_SDW_TGL_HDMI | +SOC_SDW_PCH_DMIC | + RT711_JD1), + }, {/* NUC15 'Rooks County' LAPRC510 and LAPRC710 skews */ .callback = sof_sdw_quirk_cb,
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH 4/6 ASoC: Intel: sof_sdw: create BT dai link if bt_link_mask is set
In reply to Bard LiaoThe bt_link_mask value is from NHLT. The BT dai link should be created if bt_link_mask is set. Besides, hda_machine_select() will look for the topology with BT BE.
--- sound/soc/intel/boards/sof_sdw.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
sound/soc/intel/boards/sof_sdw.c +15 -8
@@ -1138,15 +1138,22 @@ static int create_bt_dailinks(struct snd_soc_card *card, struct snd_soc_dai_link **dai_links, int *be_id) { struct device *dev = card->dev; -int port = (sof_sdw_quirk &SOF_BT_OFFLOAD_SSP_MASK ) >> -SOF_BT_OFFLOAD_SSP_SHIFT ; -char *name =devm_kasprintf (dev,GFP_KERNEL ,"SSP%d-BT" , port); -char *cpu_dai_name =devm_kasprintf (dev,GFP_KERNEL ,"SSP%d Pin" , port); +struct snd_soc_acpi_mach *mach =dev_get_platdata (dev); +char *cpu_dai_name; +char *name; +int port; +int ret; + +if (sof_sdw_quirk &SOF_SSP_BT_OFFLOAD_PRESENT ) + port = (sof_sdw_quirk &SOF_BT_OFFLOAD_SSP_MASK ) >>SOF_BT_OFFLOAD_SSP_SHIFT ; +else + port =fls (mach->mach_params.bt_link_mask) -1 ; + + name =devm_kasprintf (dev,GFP_KERNEL ,"SSP%d-BT" , port); + cpu_dai_name =devm_kasprintf (dev,GFP_KERNEL ,"SSP%d Pin" , port);if (!name || !cpu_dai_name)return -ENOMEM ; -int ret; - ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name, 1, 1, cpu_dai_name, "dummy", snd_soc_dummy_dlc.name, snd_soc_dummy_dlc.dai_name,
@@ -1243,7 +1250,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) mach_params->dmic_num =DMIC_DEFAULT_CHANNELS ; } -if (sof_sdw_quirk &SOF_SSP_BT_OFFLOAD_PRESENT ) +if (sof_sdw_quirk &SOF_SSP_BT_OFFLOAD_PRESENT || mach_params->bt_link_mask) bt_num =1 ; dev_dbg(dev, "DAI link numbers: sdw %d, ssp %d, dmic %d, hdmi %d, bt: %d\n",
@@ -1298,7 +1305,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) goto err_end;/* BT */ -if (sof_sdw_quirk &SOF_SSP_BT_OFFLOAD_PRESENT ) { +if (bt_num) { ret =create_bt_dailinks (card, &dai_links, &be_id);if (ret) goto err_end;
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH 5/6 ASoC: Intel: soc-acpi-ptl-match: add cs42l43_agg_l3_cs35l56_2 support
In reply to Bard LiaoFrom: Mac Chiang <[email protected]>
This patch adds the aggregated mode support:
cs42l43 codec with left and right tweeters on soundwire link 3, cs35l56 left and right woofers on soundwire link 2.
--- .../intel/common/soc-acpi-intel-ptl-match.c | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+)
sound/soc/intel/common/soc-acpi-intel-ptl-match.c +44 -0
@@ -236,6 +236,30 @@ static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = { } }; +static const struct snd_soc_acpi_adr_device cs42l43_3_agg_adr[] = { + { + .adr =0x00033001FA424301ull , + .num_endpoints =ARRAY_SIZE (cs42l43_amp_spkagg_endpoints), + .endpoints = cs42l43_amp_spkagg_endpoints, + .name_prefix ="cs42l43" + } +}; + +static const struct snd_soc_acpi_adr_device cs35l56_2_lr_adr[] = { + { + .adr =0x00023001fa355601ull , + .num_endpoints =1 , + .endpoints = &spk_l_endpoint, + .name_prefix ="AMP1" + }, + { + .adr =0x00023101fa355601ull , + .num_endpoints =1 , + .endpoints = &spk_r_endpoint, + .name_prefix ="AMP2" + } +}; +static const struct snd_soc_acpi_adr_device cs35l56_1_3amp_adr[] = { { .adr =0x00013001fa355601ull ,
@@ -440,6 +464,20 @@ static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = { } }; +static const struct snd_soc_acpi_link_adr ptl_cs42l43_agg_l3_cs35l56_l2[] = { + { + .mask =BIT (3 ), + .num_adr =ARRAY_SIZE (cs42l43_3_agg_adr), + .adr_d = cs42l43_3_agg_adr, + }, + { + .mask =BIT (2 ), + .num_adr =ARRAY_SIZE (cs35l56_2_lr_adr), + .adr_d = cs35l56_2_lr_adr, + }, + {} +}; +static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = { { .mask =BIT (2 ),
@@ -675,6 +713,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { .sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l2.tplg", .get_function_tplg_files = sof_sdw_get_tplg_files, }, + { + .link_mask = BIT(2) | BIT(3), + .links = ptl_cs42l43_agg_l3_cs35l56_l2, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-ptl-cs42l43-agg-l3-cs35l56-l2.tplg", + }, { .link_mask = BIT(0), .links = ptl_rvp,
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH 6/6 ASoC: Intel: sof_sdw: add codec speaker support for the SKU
In reply to Bard LiaoFrom: Mac Chiang <[email protected]>
This patch adds Cirrus codec internal speaker configuration to support the cs42l43_l3_cs35l56_l2 machine.
--- sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/soc/intel/boards/sof_sdw.c +11 -0
@@ -771,6 +771,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { }, .driver_data = (void *)(SOC_SDW_PCH_DMIC), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Google" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Lapis"), + }, + .driver_data = (void *)(SOC_SDW_CODEC_SPKR | +SOC_SDW_PCH_DMIC | +SOF_BT_OFFLOAD_SSP (2 ) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { .callback = sof_sdw_quirk_cb, .matches = {
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 5 lines · Bard Liao
Add supports for new audio configurations on Intel platforms.
Bard Liao (1):
ASoC: Intel:sof_sdw: create BT dai link ifbt_link_maskis set
Quoted 8 lines
Mac Chiang (4):
ASoC: Intel: soc-acpi-intel-ptl-match: Add support forrt722_l0_rt1320_l23ASoC: Intel:
sof_sdw: Add quirk to exclude RT722 speaker
ASoC: Intel: soc-acpi-ptl-match: addcs42l43_agg_l3_cs35l56_2support
ASoC: Intel:sof_sdw: add codec speaker support for the SKU[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/6] ASoC: Intel: soc-acpi-intel-ptl-match: Add support for rt722_l0_rt1320_l23
commit: 38ecd1384079d5f7b6942b68496ee7e85aa9a883
[2/6] ASoC: Intel: sof_sdw: Add quirk to exclude RT722 speaker
commit: 660d946ce6fd64678b4ed6b083dfc24c0f4d5a69
[3/6] ASOC: Intel: sof_sdw: add quirk for Avell B.ON (OEM rebranded NUC15)
commit: 1d5bf23aa1e8aea43beca78dc5d69c68955e8871
[4/6] ASoC: Intel: sof_sdw: create BT dai link if bt_link_mask is set
commit: f78d96c289da743d517f700d3fe7c6c43df667b5
[5/6] ASoC: Intel: soc-acpi-ptl-match: add cs42l43_agg_l3_cs35l56_2 support
commit: dfbb57c2767dc128f6360c3e41136bff8fa6f924
[6/6] ASoC: Intel: sof_sdw: add codec speaker support for the SKU
commit: 873bc94689d832878befbcadc10b6ad5bb4e0027All 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