Skip to content

Commit 828497f

Browse files
committed
ASoC: Add Intel machine driver support for CS35L63
Merge series from Stefan Binding <sbinding@opensource.cirrus.com>: This adds support to the Intel machine drivers for CS35L63 codecs using soundwire, and also adds match entries for the CDB35L63-CB2 on MTL systems.
2 parents 15c2b04 + 8c4d2cc commit 828497f

File tree

2 files changed

+63
-0
lines changed

2 files changed

+63
-0
lines changed

sound/soc/intel/common/soc-acpi-intel-mtl-match.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,24 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_l_adr[] = {
730730
}
731731
};
732732

733+
static const struct snd_soc_acpi_adr_device cs35l63_1_fb_adr[] = {
734+
{
735+
.adr = 0x00013001FA356301ull,
736+
.num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),
737+
.endpoints = cs35l56_l_fb_endpoints,
738+
.name_prefix = "AMP1"
739+
},
740+
};
741+
742+
static const struct snd_soc_acpi_adr_device cs35l63_3_fb_adr[] = {
743+
{
744+
.adr = 0x00033101FA356301ull,
745+
.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
746+
.endpoints = cs35l56_r_fb_endpoints,
747+
.name_prefix = "AMP2"
748+
},
749+
};
750+
733751
static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {
734752
/* Expected order: jack -> amp */
735753
{
@@ -1027,6 +1045,20 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x8_link0_link1_fb[] = {
10271045
{}
10281046
};
10291047

1048+
static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {
1049+
{
1050+
.mask = BIT(3),
1051+
.num_adr = ARRAY_SIZE(cs35l63_3_fb_adr),
1052+
.adr_d = cs35l63_3_fb_adr,
1053+
},
1054+
{
1055+
.mask = BIT(1),
1056+
.num_adr = ARRAY_SIZE(cs35l63_1_fb_adr),
1057+
.adr_d = cs35l63_1_fb_adr,
1058+
},
1059+
{}
1060+
};
1061+
10301062
/* this table is used when there is no I2S codec present */
10311063
struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
10321064
/* mockup tests need to be first */
@@ -1134,6 +1166,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
11341166
.sof_tplg_filename = "sof-mtl-cs42l43-l0.tplg",
11351167
.get_function_tplg_files = sof_sdw_get_tplg_files,
11361168
},
1169+
{
1170+
.link_mask = BIT(1) | BIT(3),
1171+
.links = mtl_cs35l63_x2_link1_link3_fb,
1172+
.drv_name = "sof_sdw",
1173+
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",
1174+
},
11371175
{
11381176
.link_mask = GENMASK(3, 0),
11391177
.links = mtl_3_in_1_sdca,

sound/soc/sdw_utils/soc_sdw_utils.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,31 @@ struct asoc_sdw_codec_info codec_info_list[] = {
510510
},
511511
.dai_num = 2,
512512
},
513+
{
514+
.part_id = 0x3563,
515+
.dais = {
516+
{
517+
.direction = {true, false},
518+
.dai_name = "cs35l56-sdw1",
519+
.dai_type = SOC_SDW_DAI_TYPE_AMP,
520+
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
521+
.init = asoc_sdw_cs_amp_init,
522+
.rtd_init = asoc_sdw_cs_spk_rtd_init,
523+
.controls = generic_spk_controls,
524+
.num_controls = ARRAY_SIZE(generic_spk_controls),
525+
.widgets = generic_spk_widgets,
526+
.num_widgets = ARRAY_SIZE(generic_spk_widgets),
527+
},
528+
{
529+
.direction = {false, true},
530+
.dai_name = "cs35l56-sdw1c",
531+
.dai_type = SOC_SDW_DAI_TYPE_AMP,
532+
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
533+
.rtd_init = asoc_sdw_cs_spk_feedback_rtd_init,
534+
},
535+
},
536+
.dai_num = 2,
537+
},
513538
{
514539
.part_id = 0x4242,
515540
.dais = {

0 commit comments

Comments
 (0)