Unverified Commit 55fc0344 authored by Gongjun Song's avatar Gongjun Song Committed by Mark Brown
Browse files

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



Audio hardware configuration of SKU 0C10 product is rt714 on link0,
two rt1316s on link1 and link2

Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarGongjun Song <gongjun.song@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20221110225432.144184-3-pierre-louis.bossart@linux.intel.com


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

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

+43 −0
Original line number Diff line number Diff line
@@ -65,6 +65,15 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group1_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt1316_2_group1_adr[] = {

	{

		.adr = 0x000230025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "rt1316-2"

	}

};



static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = {

	{

		.adr = 0x000330025D131601ull,
@@ -74,6 +83,15 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt714_0_adr[] = {

	{

		.adr = 0x000030025D071401ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt714"

	}

};



static const struct snd_soc_acpi_adr_device rt714_2_adr[] = {

	{

		.adr = 0x000230025D071401ull,
@@ -107,6 +125,25 @@ static const struct snd_soc_acpi_link_adr rpl_sdca_3_in_1[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr rpl_sdw_rt1316_link12_rt714_link0[] = {

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt1316_1_group1_adr),

		.adr_d = rt1316_1_group1_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt1316_2_group1_adr),

		.adr_d = rt1316_2_group1_adr,

	},

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt714_0_adr),

		.adr_d = rt714_0_adr,

	},

	{}

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {

	{},

};
@@ -120,6 +157,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

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

	},

	{

		.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */

		.links = rpl_sdw_rt1316_link12_rt714_link0,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-rpl-rt1316-l12-rt714-l0.tplg",

	},

	{

		.link_mask = 0x1, /* link0 required */

		.links = rpl_rvp,