ASoC: Intel: add rt722/rt721 support for PTL platform
Subsystems (3)
Bard Liao
maintainerv2 cover ASoC: Intel: add rt722/rt721 support for PTL platform
Rt722, rt721 and rt712 codecs are quite similar. Refactor the existing spk_rtd_init() to support Realtek common multifunction SDCA codecs.
The "ASoC: Intel: soc-acpi-intel-ptl-match: Add rt721 support" patch should not be applied before the "ASoC: rt721-sdca: Add RT721 SDCA driver" is applied.
v2:
- Add missing "select SND_SOC_RT721_SDCA_SDW"
Dharageswari R (1):
ASoC: intel: sof_sdw: add RT722 SDCA card for PTL platform
Naveen Manohar (2):
ASoC: intel/sdw_utils: refactor RT multifunction sdca speaker codecs
ASoC: Intel: soc-acpi-intel-ptl-match: Add rt721 support
include/sound/soc_sdw_utils.h | 3 +- sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/sof_sdw.c | 8 ++ .../intel/common/soc-acpi-intel-ptl-match.c | 62 +++++++++++-- sound/soc/sdw_utils/Makefile | 3 +- sound/soc/sdw_utils/soc_sdw_rt712_sdca.c | 48 ---------- sound/soc/sdw_utils/soc_sdw_rt722_sdca.c | 41 --------- sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c | 90 +++++++++++++++++++ .../sdw_utils/soc_sdw_rt_sdca_jack_common.c | 8 ++ sound/soc/sdw_utils/soc_sdw_utils.c | 45 +++++++++- 10 files changed, 207 insertions(+), 102 deletions(-) delete mode 100644 sound/soc/sdw_utils/soc_sdw_rt712_sdca.c delete mode 100644 sound/soc/sdw_utils/soc_sdw_rt722_sdca.c create mode 100644 sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH v2 1/3 ASoC: intel: sof_sdw: add RT722 SDCA card for PTL platform
From: Dharageswari R <[email protected]>
Enable on-board rt722 based sound card for PTL RVP.
--- sound/soc/intel/boards/sof_sdw.c | 8 +++++++ .../intel/common/soc-acpi-intel-ptl-match.c | 24 +++++++++++++++++++ 2 files changed, 32 insertions(+)
sound/soc/intel/boards/sof_sdw.c +8 -0
@@ -598,6 +598,14 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { }, .driver_data = (void *)(SOC_SDW_CODEC_SPKR), }, +/* Pantherlake devices*/ + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_ptlrvp"), + }, + .driver_data = (void *)(SOC_SDW_PCH_DMIC), + }, {} };
sound/soc/intel/common/soc-acpi-intel-ptl-match.c +24 -0
@@ -78,6 +78,15 @@ static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt722_1_single_adr[] = { + { + .adr =0x000130025d072201ull , + .num_endpoints =ARRAY_SIZE (rt722_endpoints), + .endpoints = rt722_endpoints, + .name_prefix ="rt722" + } +}; +static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = { { .adr =0x000330025d072201ull ,
@@ -96,6 +105,15 @@ static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = { {} }; +static const struct snd_soc_acpi_link_adr ptl_rt722_l1[] = { + { + .mask =BIT (1 ), + .num_adr =ARRAY_SIZE (rt722_1_single_adr), + .adr_d = rt722_1_single_adr, + }, + {} +}; +static const struct snd_soc_acpi_link_adr ptl_rt722_l3[] = { { .mask =BIT (3 ),
@@ -147,6 +165,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-ptl-rt722.tplg", }, + { + .link_mask = BIT(1), + .links = ptl_rt722_l1, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-ptl-rt722.tplg", + }, { .link_mask = BIT(3), .links = ptl_rt722_l3,
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH v2 2/3 ASoC: intel/sdw_utils: refactor RT multifunction sdca speaker codecs
In reply to Bard LiaoFrom: Naveen Manohar <[email protected]>
Merge spk_rtd_init for multifunction sdca codecs:rt712/rt722
--- include/sound/soc_sdw_utils.h | 3 +- .../intel/common/soc-acpi-intel-ptl-match.c | 18 ++-- sound/soc/sdw_utils/Makefile | 3 +- sound/soc/sdw_utils/soc_sdw_rt712_sdca.c | 48 ----------- sound/soc/sdw_utils/soc_sdw_rt722_sdca.c | 41 --------- sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c | 85 +++++++++++++++++++ sound/soc/sdw_utils/soc_sdw_utils.c | 4 +- 7 files changed, 98 insertions(+), 104 deletions(-) delete mode 100644 sound/soc/sdw_utils/soc_sdw_rt712_sdca.c delete mode 100644 sound/soc/sdw_utils/soc_sdw_rt722_sdca.c create mode 100644 sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c
include/sound/soc_sdw_utils.h +1 -2
@@ -234,8 +234,7 @@ int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_sint asoc_sdw_rt_amp_spk_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai);int asoc_sdw_rt700_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai);int asoc_sdw_rt711_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai); -int asoc_sdw_rt712_spk_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai); -int asoc_sdw_rt722_spk_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai); +int asoc_sdw_rt_mf_sdca_spk_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai);int asoc_sdw_rt5682_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai);int asoc_sdw_cs42l42_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai);int asoc_sdw_cs42l43_hs_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai);
sound/soc/intel/common/soc-acpi-intel-ptl-match.c +9 -9
@@ -36,10 +36,10 @@ static const struct snd_soc_acpi_endpoint single_endpoint = { };/* -* RT722 is a multi-function codec, three endpoints are created for -* its headset, amp and dmic functions. +* Multi-function codecs with three endpoints created for +* headset, amp and dmic functions. */ -static const struct snd_soc_acpi_endpoint rt722_endpoints[] = { +static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = { { .num =0 , .aggregated =0 ,
@@ -72,8 +72,8 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = { { .adr =0x000030025d072201ull , - .num_endpoints =ARRAY_SIZE (rt722_endpoints), - .endpoints = rt722_endpoints, + .num_endpoints =ARRAY_SIZE (rt_mf_endpoints), + .endpoints = rt_mf_endpoints, .name_prefix ="rt722" } };
@@ -81,8 +81,8 @@ static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = {static const struct snd_soc_acpi_adr_device rt722_1_single_adr[] = { { .adr =0x000130025d072201ull , - .num_endpoints =ARRAY_SIZE (rt722_endpoints), - .endpoints = rt722_endpoints, + .num_endpoints =ARRAY_SIZE (rt_mf_endpoints), + .endpoints = rt_mf_endpoints, .name_prefix ="rt722" } };
@@ -90,8 +90,8 @@ static const struct snd_soc_acpi_adr_device rt722_1_single_adr[] = {static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = { { .adr =0x000330025d072201ull , - .num_endpoints =ARRAY_SIZE (rt722_endpoints), - .endpoints = rt722_endpoints, + .num_endpoints =ARRAY_SIZE (rt_mf_endpoints), + .endpoints = rt_mf_endpoints, .name_prefix ="rt722" } };
sound/soc/sdw_utils/Makefile +1 -2
@@ -1,9 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \ soc_sdw_rt700.o soc_sdw_rt711.o \ - soc_sdw_rt712_sdca.o soc_sdw_rt722_sdca.o \ soc_sdw_rt5682.o soc_sdw_rt_sdca_jack_common.o \ - soc_sdw_rt_amp.o \ + soc_sdw_rt_amp.o soc_sdw_rt_mf_sdca.o \ soc_sdw_bridge_cs35l56.o \ soc_sdw_cs42l42.o soc_sdw_cs42l43.o \ soc_sdw_cs_amp.o \
sound/soc/sdw_utils/soc_sdw_rt712_sdca.c deleted +0 -48
48 lines not on this page · raw message
sound/soc/sdw_utils/soc_sdw_rt722_sdca.c deleted +0 -41
41 lines not on this page · raw message
sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c new file +85 -0
85 lines not on this page · raw message
sound/soc/sdw_utils/soc_sdw_utils.c +2 -2
@@ -138,7 +138,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, .init = asoc_sdw_rt_amp_init, .exit = asoc_sdw_rt_amp_exit, - .rtd_init = asoc_sdw_rt712_spk_rtd_init, + .rtd_init = asoc_sdw_rt_mf_sdca_spk_rtd_init, .controls = generic_spk_controls, .num_controls = ARRAY_SIZE(generic_spk_controls), .widgets = generic_spk_widgets,
@@ -358,7 +358,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, .init = asoc_sdw_rt_amp_init, .exit = asoc_sdw_rt_amp_exit, - .rtd_init = asoc_sdw_rt722_spk_rtd_init, + .rtd_init = asoc_sdw_rt_mf_sdca_spk_rtd_init, .controls = generic_spk_controls, .num_controls = ARRAY_SIZE(generic_spk_controls), .widgets = generic_spk_widgets,
Signature · 1 line
2.43.0
Bard Liao
maintainerPATCH v2 3/3 ASoC: Intel: soc-acpi-intel-ptl-match: Add rt721 support
In reply to Bard LiaoFrom: Naveen Manohar <[email protected]>
Patch adds driver data & match table for rt721
multi-function codec on PTL-RVP at sdw link3.
--- sound/soc/intel/boards/Kconfig | 1 + .../intel/common/soc-acpi-intel-ptl-match.c | 24 +++++++++++ sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c | 5 +++ .../sdw_utils/soc_sdw_rt_sdca_jack_common.c | 8 ++++ sound/soc/sdw_utils/soc_sdw_utils.c | 41 +++++++++++++++++++ 5 files changed, 79 insertions(+)
sound/soc/intel/boards/Kconfig +1 -0
@@ -519,6 +519,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH select SND_SOC_RT712_SDCA_DMIC_SDW select SND_SOC_RT715_SDW select SND_SOC_RT715_SDCA_SDW + select SND_SOC_RT721_SDCA_SDW select SND_SOC_RT722_SDCA_SDW select SND_SOC_RT1308_SDW select SND_SOC_RT1308
sound/soc/intel/common/soc-acpi-intel-ptl-match.c +24 -0
@@ -69,6 +69,24 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = { + { + .adr =0x000330025d072101ull , + .num_endpoints =ARRAY_SIZE (rt_mf_endpoints), + .endpoints = rt_mf_endpoints, + .name_prefix ="rt721" + } +}; + +static const struct snd_soc_acpi_link_adr ptl_rt721_l3[] = { + { + .mask =BIT (3 ), + .num_adr =ARRAY_SIZE (rt721_3_single_adr), + .adr_d = rt721_3_single_adr, + }, + {}, +}; +static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = { { .adr =0x000030025d072201ull ,
@@ -159,6 +177,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-ptl-rt711.tplg", }, + { + .link_mask = BIT(3), + .links = ptl_rt721_l3, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-ptl-rt721.tplg", + }, { .link_mask = BIT(0), .links = ptl_rt722_only,
sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c +5 -0
@@ -25,6 +25,10 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = { { "Speaker", NULL, "rt712 SPOR" }, }; +static const struct snd_soc_dapm_route rt721_spk_map[] = { + {"Speaker" ,NULL ,"rt721 SPK" }, +}; +static const struct snd_soc_dapm_route rt722_spk_map[] = { {"Speaker" ,NULL ,"rt722 SPK" }, };
@@ -39,6 +43,7 @@ struct codec_route_map {/* Codec route maps array */ static const struct codec_route_map codec_routes[] = { {"rt712" , rt712_spk_map,ARRAY_SIZE (rt712_spk_map) }, + {"rt721" , rt721_spk_map,ARRAY_SIZE (rt721_spk_map) }, {"rt722" , rt722_spk_map,ARRAY_SIZE (rt722_spk_map) }, };
sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c +8 -0
@@ -60,6 +60,11 @@ static const struct snd_soc_dapm_route rt713_sdca_map[] = { { "rt713 MIC2", NULL, "Headset Mic" }, }; +static const struct snd_soc_dapm_route rt721_sdca_map[] = { + {"Headphone" ,NULL ,"rt721 HP" }, + {"rt721 MIC2" ,NULL ,"Headset Mic" }, +}; +static const struct snd_soc_dapm_route rt722_sdca_map[] = { {"Headphone" ,NULL ,"rt722 HP" }, { "rt722 MIC2", NULL, "Headset Mic" },
@@ -121,6 +126,9 @@ int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_s }else if (strstr (component->name_prefix,"rt713" )) { ret =snd_soc_dapm_add_routes (&card->dapm, rt713_sdca_map,ARRAY_SIZE (rt713_sdca_map)); + }else if (strstr (component->name_prefix,"rt721" )) { + ret =snd_soc_dapm_add_routes (&card->dapm, rt721_sdca_map, +ARRAY_SIZE (rt721_sdca_map)); }else if (strstr (component->name_prefix,"rt722" )) { ret =snd_soc_dapm_add_routes (&card->dapm, rt722_sdca_map,ARRAY_SIZE (rt722_sdca_map));
sound/soc/sdw_utils/soc_sdw_utils.c +41 -0
47 lines not on this page · raw message
Signature · 1 line
2.43.0