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

Add SoundWire machines for ACP7.0/ACP7.1 sof stack 

Merge series from Vijendar Mukunda <Vijendar.Mukunda@amd.com>:

Add SoundWire machines as alternate machines for ACP7.0 & ACP7.1
platforms with the below machine configuration.
Link 0: RT722 codec with three endpoints: Headset, Speaker, and DMIC.
parents 9d330278 59566923

sound/soc/amd/acp/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ config SND_SOC_AMD_SOF_SDW_MACH 
	select SND_SOC_RT1316_SDW

	select SND_SOC_RT715_SDW

	select SND_SOC_RT715_SDCA_SDW

	select SND_SOC_RT722_SDCA_SDW

	help

	  This option enables SOF sound card support for SoundWire enabled

	  AMD platforms along with ACP PDM controller.

sound/soc/amd/acp/amd-acp70-acpi-match.c

+12 −0
Original line number Diff line number Diff line
@@ -155,6 +155,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = { 
};

EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sdw_machines);



struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sof_sdw_machines[] = {

	{

		.link_mask = BIT(0),

		.links = acp70_rt722_only,

		.drv_name = "amd_sof_sdw",

		.sof_tplg_filename = "sof-acp_7_0-rt722-l0.tplg",

		.fw_filename = "sof-acp_7_0.ri",

	},

	{},

};

EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sof_sdw_machines);



MODULE_DESCRIPTION("AMD ACP7.0 & ACP7.1 tables and support for ACPI enumeration");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Vijendar.Mukunda@amd.com");

sound/soc/amd/mach-config.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sdw_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sof_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sof_sdw_machines[];



struct config_entry {

	u32 flags;

sound/soc/sof/amd/pci-acp70.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static const struct sof_amd_acp_desc acp70_chip_info = { 


static const struct sof_dev_desc acp70_desc = {

	.machines		= snd_soc_acpi_amd_acp70_sof_machines,

	.alt_machines           = snd_soc_acpi_amd_acp70_sof_sdw_machines,

	.resindex_lpe_base	= 0,

	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,