Unverified Commit 18489174 authored by Yong Zhi's avatar Yong Zhi Committed by Mark Brown
Browse files

ASoC: intel: sof_sdw: add RT711 SDCA card for MTL platform 



Enable on-board rt711 based sound card for MTL RVP.

Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarYong Zhi <yong.zhi@intel.com>
Signed-off-by: default avatarUday M Bhat <uday.m.bhat@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220610214415.42942-1-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_sdw.c

+8 −0
Original line number Diff line number Diff line
@@ -315,6 +315,14 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
					RT711_JD2 |

					SOF_SDW_FOUR_SPK),

	},

	/* MeteorLake devices */

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_mtlrvp"),

		},

		.driver_data = (void *)(RT711_JD1 | SOF_SDW_TGL_HDMI),

	},

	{}

};

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

+31 −0
Original line number Diff line number Diff line
@@ -15,6 +15,31 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = { 
};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_machines);



static const struct snd_soc_acpi_endpoint single_endpoint = {

	.num = 0,

	.aggregated = 0,

	.group_position = 0,

	.group_id = 0,

};



static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {

	{

		.adr = 0x000030025D071101ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt711"

	}

};



static const struct snd_soc_acpi_link_adr mtl_rvp[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_sdca_0_adr),

		.adr_d = rt711_sdca_0_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 */
@@ -36,6 +61,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 = BIT(0),

		.links = mtl_rvp,

		.drv_name = "sof_sdw",

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

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_sdw_machines);