Unverified Commit b06e33aa authored by Chao Song's avatar Chao Song Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi: add support for MTL SDCA boards 



The description and board layout is changed and different
from previous ones for CometLake and Tigerlake.

The new codec layout for MTL is:
  SDW0: RT711 Headphone
  SDW1: RT714 DMIC
  SDW2: RT1316 Speaker
  SDW3: RT1316 Speaker

The previous codec layout for CML and TGL is:
  SDW0: RT711 Headphone
  SDW1: RT1316 Speaker
  SDW2: RT1316 Speaker
  SDW3: RT714 DMIC

Signed-off-by: default avatarChao Song <chao.song@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20230512173305.65399-5-pierre-louis.bossart@linux.intel.com


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

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

+57 −0
Original line number Diff line number Diff line
@@ -98,6 +98,33 @@ static const struct snd_soc_acpi_adr_device rt5682_2_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt1316_2_group1_adr[] = {

	{

		.adr = 0x000230025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "rt1316-1"

	}

};



static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = {

	{

		.adr = 0x000331025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "rt1316-2"

	}

};



static const struct snd_soc_acpi_adr_device rt714_1_adr[] = {

	{

		.adr = 0x000130025D071401ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt714"

	}

};



static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {

	/* Expected order: jack -> amp */

	{
@@ -122,6 +149,30 @@ static const struct snd_soc_acpi_link_adr mtl_rvp[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr mtl_3_in_1_sdca[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_sdca_0_adr),

		.adr_d = rt711_sdca_0_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt1316_2_group1_adr),

		.adr_d = rt1316_2_group1_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt1316_3_group1_adr),

		.adr_d = rt1316_3_group1_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt714_1_adr),

		.adr_d = rt714_1_adr,

	},

	{}

};



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

struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {

	/* mockup tests need to be first */
@@ -143,6 +194,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-mtl-rt715-rt711-rt1308-mono.tplg",

	},

	{

		.link_mask = GENMASK(3, 0),

		.links = mtl_3_in_1_sdca,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-mtl-rt711-l0-rt1316-l23-rt714-l1.tplg",

	},

	{

		.link_mask = BIT(0),

		.links = mtl_rvp,