Unverified Commit 359ace2b authored by Gongjun Song's avatar Gongjun Song Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi: add SKU 0B29 SoundWire configuration 



Product audio hardware configuration is rt711 on link2,
two rt1316s on link0 and link1, rt714 on link 3.

Signed-off-by: default avatarGongjun Song <gongjun.song@intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20211105022646.26305-9-yung-chuan.liao@linux.intel.com


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

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

+58 −0
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt711_sdca_2_adr[] = {

	{

		.adr = 0x000230025D071101ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt711"

	}

};



static const struct snd_soc_acpi_adr_device rt1316_1_group1_adr[] = {

	{

		.adr = 0x000131025D131601ull, /* unique ID is set for some reason */
@@ -101,6 +110,24 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt1316_0_group2_adr[] = {

	{

		.adr = 0x000031025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "rt1316-1"

	}

};



static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = {

	{

		.adr = 0x000130025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "rt1316-2"

	}

};



static const struct snd_soc_acpi_adr_device rt1316_2_single_adr[] = {

	{

		.adr = 0x000230025D131601ull,
@@ -209,6 +236,30 @@ static const struct snd_soc_acpi_link_adr adl_sdca_3_in_1[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link2_rt1316_link01_rt714_link3[] = {

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt711_sdca_2_adr),

		.adr_d = rt711_sdca_2_adr,

	},

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt1316_0_group2_adr),

		.adr_d = rt1316_0_group2_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt1316_1_group2_adr),

		.adr_d = rt1316_1_group2_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt714_3_adr),

		.adr_d = rt714_3_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link12_rt714_link0[] = {

	{

		.mask = BIT(1),
@@ -372,6 +423,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l13-rt714-l2.tplg",

	},

	{

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

		.links = adl_sdw_rt711_link2_rt1316_link01_rt714_link3,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01-rt714-l3.tplg",

	},

	{

		.link_mask = 0xC, /* rt1316 on link2 & rt714 on link3 */

		.links = adl_sdw_rt1316_link2_rt714_link3,