Unverified Commit 11fe58c4 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: SOF: Intel: add MeteorLake machines 



Add support for MeteorLake (MTL) machines support, starting with mockup
devices.

Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220606204622.144424-2-pierre-louis.bossart@linux.intel.com


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

include/sound/soc-acpi-intel-match.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[];



extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_sdw_machines[];
@@ -37,6 +38,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_sdw_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[];



/*

 * generic table used for HDA codec-based platforms, possibly with

sound/soc/intel/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m 
	soc-acpi-intel-cml-match.o soc-acpi-intel-icl-match.o \

	soc-acpi-intel-tgl-match.o soc-acpi-intel-ehl-match.o \

	soc-acpi-intel-jsl-match.o soc-acpi-intel-adl-match.o \

	soc-acpi-intel-mtl-match.o \

	soc-acpi-intel-hda-match.o \

	soc-acpi-intel-sdw-mockup-match.o

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * soc-acpi-intel-mtl-match.c - tables and support for MTL ACPI enumeration.

 *

 * Copyright (c) 2022, Intel Corporation.

 *

 */



#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include "soc-acpi-intel-sdw-mockup-match.h"



struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_machines);



/* 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 */

	{

		.link_mask = GENMASK(3, 0),

		.links = sdw_mockup_headset_2amps_mic,

		.drv_name = "sof_sdw",

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

	},

	{

		.link_mask = BIT(0) | BIT(1) | BIT(3),

		.links = sdw_mockup_headset_1amp_mic,

		.drv_name = "sof_sdw",

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

	},

	{

		.link_mask = GENMASK(2, 0),

		.links = sdw_mockup_mic_headset_1amp,

		.drv_name = "sof_sdw",

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

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_sdw_machines);