Unverified Commit dfbb57c2 authored by Mac Chiang's avatar Mac Chiang Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi-ptl-match: add cs42l43_agg_l3_cs35l56_2 support 



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.

Signed-off-by: default avatarMac Chiang <mac.chiang@intel.com>
Reviewed-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20251111123737.246626-6-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f78d96c2

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

+44 −0
Original line number Diff line number Diff line
@@ -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,