Unverified Commit 1ff07522 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi-intel-lnl-match: add cs42l43 6x cs35l56 support 



This add a match for cs42l43 on sdw link 2, 3 cs35l56 on sdw link 1 and
3. All speakers are aggregated.

Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarLiam Girdwood <liam.r.girdwood@intel.com>
Link: https://patch.msgid.link/20250305135443.201884-9-yung-chuan.liao@linux.intel.com


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

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

+131 −0
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = { 
	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_1_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 1,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_2_endpoint = {

	.num = 0,

	.aggregated = 1,
@@ -51,6 +58,27 @@ static const struct snd_soc_acpi_endpoint spk_3_endpoint = { 
	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_4_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 4,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_5_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 5,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_6_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 6,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint rt712_endpoints[] = {

	{

		.num = 0,
@@ -159,6 +187,33 @@ static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = { 
	},

};



static const struct snd_soc_acpi_endpoint cs42l43_amp_spkagg_endpoints[] = {

	{ /* Jack Playback Endpoint */

		.num = 0,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{ /* DMIC Capture Endpoint */

		.num = 1,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{ /* Jack Capture Endpoint */

		.num = 2,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{ /* Speaker Playback Endpoint */

		.num = 3,

		.aggregated = 1,

		.group_position = 0,

		.group_id = 1,

	},

};



static const struct snd_soc_acpi_adr_device cs35l56_2_l_adr[] = {

	{

		.adr = 0x00023001FA355601ull,
@@ -204,6 +259,48 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_lr_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device cs35l56_1_3amp_adr[] = {

	{

		.adr = 0x00013001fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_1_endpoint,

		.name_prefix = "AMP1"

	},

	{

		.adr = 0x00013101fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_2_endpoint,

		.name_prefix = "AMP2"

	},

	{

		.adr = 0x00013201fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_3_endpoint,

		.name_prefix = "AMP3"

	}

};



static const struct snd_soc_acpi_adr_device cs35l56_3_3amp_adr[] = {

	{

		.adr = 0x00033301fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_4_endpoint,

		.name_prefix = "AMP4"

	},

	{

		.adr = 0x00033401fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_5_endpoint,

		.name_prefix = "AMP5"

	},

	{

		.adr = 0x00033501fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_6_endpoint,

		.name_prefix = "AMP6"

	}

};



static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = {

	{

		.adr = 0x00003001FA424301ull,
@@ -213,6 +310,15 @@ static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = {

	{

		.adr = 0x00023001fa424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_amp_spkagg_endpoints),

		.endpoints = cs42l43_amp_spkagg_endpoints,

		.name_prefix = "cs42l43"

	}

};



static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {

	{

		.adr = 0x000030025D071101ull,
@@ -408,6 +514,25 @@ static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l23[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr lnl_cs42l43_l2_cs35l56x6_l13[] = {

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(cs42l43_2_adr),

		.adr_d = cs42l43_2_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(cs35l56_1_3amp_adr),

		.adr_d = cs35l56_1_3amp_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(cs35l56_3_3amp_adr),

		.adr_d = cs35l56_3_3amp_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr lnl_rvp[] = {

	{

		.mask = BIT(0),
@@ -570,6 +695,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-lnl-cs42l43-l0-cs35l56-l23.tplg",

	},

	{

		.link_mask = BIT(1) | BIT(2) | BIT(3),

		.links = lnl_cs42l43_l2_cs35l56x6_l13,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-lnl-cs42l43-l2-cs35l56x6-l13.tplg",

	},

	{

		.link_mask = BIT(0) | BIT(3),

		.links = lnl_cs42l43_l0_cs35l56_l3,