Unverified Commit 9ed85cb8 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi: adl: Add match entries for new cs42l43 laptops 



Add some new match table entries on Alderlake for some coming cs42l43
laptops.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20240827123215.258859-16-yung-chuan.liao@linux.intel.com


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

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

+105 −0
Original line number Diff line number Diff line
@@ -35,6 +35,86 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = { 
	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_2_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 2,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_3_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 3,

	.group_id = 1,

};



static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {

	{

		.adr = 0x00023201FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "AMP3"

	},

	{

		.adr = 0x00023301FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_3_endpoint,

		.name_prefix = "AMP4"

	}

};



static const struct snd_soc_acpi_adr_device cs35l56_3_l_adr[] = {

	{

		.adr = 0x00033001fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "AMP1"

	},

	{

		.adr = 0x00033101fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_2_endpoint,

		.name_prefix = "AMP2"

	}

};



static const struct snd_soc_acpi_endpoint cs42l43_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 = 0,

		.group_position = 0,

		.group_id = 0,

	},

};



static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = {

	{

		.adr = 0x00003001FA424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),

		.endpoints = cs42l43_endpoints,

		.name_prefix = "cs42l43"

	}

};



static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {

	{

		.adr = 0x000020025D071100ull,
@@ -416,6 +496,25 @@ static const struct snd_soc_acpi_adr_device rt5682_0_adr[] = { 
	}

};



static const struct snd_soc_acpi_link_adr adl_cs42l43_l0_cs35l56_l23[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(cs42l43_0_adr),

		.adr_d = cs42l43_0_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(cs35l56_2_r_adr),

		.adr_d = cs35l56_2_r_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(cs35l56_3_l_adr),

		.adr_d = cs35l56_3_l_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr adl_rvp[] = {

	{

		.mask = BIT(0),
@@ -560,6 +659,12 @@ EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines); 


/* this table is used when there is no I2S codec present */

struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {

	{

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

		.links = adl_cs42l43_l0_cs35l56_l23,

		.drv_name = "sof_sdw",

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

	},

	{

		.link_mask = 0xF, /* 4 active links required */

		.links = adl_default,