Unverified Commit 870dc42f authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi: add ADL jack-less SoundWire configurations 



Add one configuration with no RT711.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarLibin Yang <libin.yang@intel.com>
Link: https://lore.kernel.org/r/20210415175013.192862-3-pierre-louis.bossart@linux.intel.com


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

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

+38 −0
Original line number Diff line number Diff line
@@ -101,6 +101,24 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt1316_2_single_adr[] = {

	{

		.adr = 0x000230025D131601,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt1316-1"

	}

};



static const struct snd_soc_acpi_adr_device rt714_0_adr[] = {

	{

		.adr = 0x000030025D071401,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt714"

	}

};



static const struct snd_soc_acpi_adr_device rt714_2_adr[] = {

	{

		.adr = 0x000230025D071401,
@@ -191,6 +209,20 @@ static const struct snd_soc_acpi_link_adr adl_sdca_3_in_1[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link2_rt714_link0[] = {

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt1316_2_single_adr),

		.adr_d = rt1316_2_single_adr,

	},

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt714_0_adr),

		.adr_d = rt714_0_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr adl_rvp[] = {

	{

		.mask = BIT(0),
@@ -225,6 +257,12 @@ 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 = 0x5, /* 2 active links required */

		.links = adl_sdw_rt1316_link2_rt714_link0,

		.drv_name = "sof_sdw",

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

	},

	{

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

		.links = adl_rvp,