Unverified Commit 57677ccd authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: amd: acp: add soundwire machines for acp6.3 based platform 

Add Soundwire machines for acp6.3 based platform.

Link: https://github.com/thesofproject/linux/pull/5068


Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801111821.18076-8-Vijendar.Mukunda@amd.com


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

sound/soc/amd/acp/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ config SND_SOC_AMD_ACP_COMMON 
	  This option enables common modules for Audio-Coprocessor i.e. ACP

	  IP block on AMD platforms.



config SND_SOC_ACPI_AMD_MATCH

	tristate

	select SND_SOC_ACPI if ACPI



if SND_SOC_AMD_ACP_COMMON



config SND_SOC_AMD_ACP_PDM

sound/soc/amd/acp/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ snd-acp70-y := acp70.o 
snd-acp-mach-y     := acp-mach-common.o

snd-acp-legacy-mach-y     := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o

snd-acp-sof-mach-y     := acp-sof-mach.o

snd-soc-acpi-amd-match-y := amd-acp63-acpi-match.o



obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o

obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o
@@ -38,3 +39,4 @@ obj-$(CONFIG_SND_AMD_SOUNDWIRE_ACPI) += snd-amd-sdw-acpi.o 
obj-$(CONFIG_SND_SOC_AMD_MACH_COMMON) += snd-acp-mach.o

obj-$(CONFIG_SND_SOC_AMD_LEGACY_MACH) += snd-acp-legacy-mach.o

obj-$(CONFIG_SND_SOC_AMD_SOF_MACH) += snd-acp-sof-mach.o

obj-$(CONFIG_SND_SOC_ACPI_AMD_MATCH) += snd-soc-acpi-amd-match.o

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

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

/*

 * amd-acp63-acpi-match.c - tables and support for ACP 6.3 platform

 * ACPI enumeration.

 *

 * Copyright 2024 Advanced Micro Devices, Inc.

 */



#include <sound/soc-acpi.h>

#include "../mach-config.h"



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_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_rt1316_group_adr[] = {

	{

		.adr = 0x000030025D071101ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt711"

	},

	{

		.adr = 0x000030025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "rt1316-1"

	},

	{

		.adr = 0x000032025D131601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "rt1316-2"

	},

};



static const struct snd_soc_acpi_adr_device rt714_adr[] = {

	{

		.adr = 0x130025d071401ull,

		.num_endpoints = 1,

		.endpoints = &single_endpoint,

		.name_prefix = "rt714"

	}

};



static const struct snd_soc_acpi_link_adr acp63_4_in_1_sdca[] = {

	{	.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_rt1316_group_adr),

		.adr_d = rt711_rt1316_group_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt714_adr),

		.adr_d = rt714_adr,

	},

	{}

};



struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_sdw_machines[] = {

	{

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

		.links = acp63_4_in_1_sdca,

		.drv_name = "amd_sof_sdw",

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

		.fw_filename = "sof-acp_6_3.ri",

	},

	{},

};

EXPORT_SYMBOL(snd_soc_acpi_amd_acp63_sof_sdw_machines);



MODULE_DESCRIPTION("AMD ACP6.3 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
@@ -23,6 +23,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sof_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_amd_vangogh_sof_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_sdw_machines[];



struct config_entry {

	u32 flags;

sound/soc/sof/amd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ config SND_SOC_SOF_AMD_COMMON 
	select SND_AMD_ACP_CONFIG

	select SND_SOC_SOF_XTENSA

	select SND_SOC_SOF_ACP_PROBES

	select SND_SOC_ACPI_AMD_MATCH

	select SND_SOC_ACPI if ACPI

	help

	  This option is not user-selectable but automatically handled by