Unverified Commit b85560f7 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: add more ACPI tables/quirks for RPL/MTL 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Add support for two RaptorLake SoundWire SKUs and one test board for
MeteorLake.

There will be additional RaptorLake SKUs shared when validation is
complete.
parents 1985fa96 8dcc2059

sound/soc/intel/boards/sof_sdw.c

+21 −0
Original line number Diff line number Diff line
@@ -355,6 +355,27 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					RT711_JD2),

	},

	/* RaptorLake devices */

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0C10"),

		},

		/* No Jack */

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_FOUR_SPK),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0C40")

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					RT711_JD2 |

					SOF_SDW_FOUR_SPK),

	},

	/* MeteorLake devices */

	{

		.callback = sof_sdw_quirk_cb,

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

+59 −0
Original line number Diff line number Diff line
@@ -39,6 +39,20 @@ static const struct snd_soc_acpi_endpoint single_endpoint = { 
	.group_id = 0,

};



static const struct snd_soc_acpi_endpoint spk_l_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 0,

	.group_id = 1,

};



static const struct snd_soc_acpi_endpoint spk_r_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 1,

	.group_id = 1,

};



static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {

	{

		.adr = 0x000030025D071101ull,
@@ -48,6 +62,45 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device mx8373_0_adr[] = {

	{

		.adr = 0x000023019F837300ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "Left"

	},

	{

		.adr = 0x000027019F837300ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "Right"

	}

};



static const struct snd_soc_acpi_adr_device rt5682_2_adr[] = {

	{

		.adr = 0x000221025D568200ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt5682"

	}

};



static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {

	/* Expected order: jack -> amp */

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt5682_2_adr),

		.adr_d = rt5682_2_adr,

	},

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(mx8373_0_adr),

		.adr_d = mx8373_0_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr mtl_rvp[] = {

	{

		.mask = BIT(0),
@@ -84,6 +137,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-mtl-rt711.tplg",

	},

	{

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

		.links = rt5682_link2_max98373_link0,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-mtl-sdw-rt5682-l2-max98373-l0.tplg",

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_sdw_machines);

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

+109 −0
Original line number Diff line number Diff line
@@ -56,6 +56,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 */
@@ -65,6 +74,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 +92,33 @@ 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 = 0x000030025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "rt1316-1"

	}

};



static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = {

	{

		.adr = 0x000131025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "rt1316-2"

	}

};



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,
@@ -83,6 +128,15 @@ static const struct snd_soc_acpi_adr_device rt714_2_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt714_3_adr[] = {

	{

		.adr = 0x000330025D071401ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt714"

	}

};



static const struct snd_soc_acpi_link_adr rpl_sdca_3_in_1[] = {

	{

		.mask = BIT(0),
@@ -107,6 +161,49 @@ static const struct snd_soc_acpi_link_adr rpl_sdca_3_in_1[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr rpl_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 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 +217,18 @@ 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 = 0xF, /* 4 active links required */

		.links = rpl_sdw_rt711_link2_rt1316_link01_rt714_link3,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-rpl-rt711-l2-rt1316-l01-rt714-l3.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,