Skip to content

Commit b28ecd8

Browse files
committed
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.
2 parents 9d33027 + 5956692 commit b28ecd8

4 files changed

Lines changed: 15 additions & 0 deletions

File tree

sound/soc/amd/acp/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ config SND_SOC_AMD_SOF_SDW_MACH
148148
select SND_SOC_RT1316_SDW
149149
select SND_SOC_RT715_SDW
150150
select SND_SOC_RT715_SDCA_SDW
151+
select SND_SOC_RT722_SDCA_SDW
151152
help
152153
This option enables SOF sound card support for SoundWire enabled
153154
AMD platforms along with ACP PDM controller.

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = {
155155
};
156156
EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sdw_machines);
157157

158+
struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sof_sdw_machines[] = {
159+
{
160+
.link_mask = BIT(0),
161+
.links = acp70_rt722_only,
162+
.drv_name = "amd_sof_sdw",
163+
.sof_tplg_filename = "sof-acp_7_0-rt722-l0.tplg",
164+
.fw_filename = "sof-acp_7_0.ri",
165+
},
166+
{},
167+
};
168+
EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sof_sdw_machines);
169+
158170
MODULE_DESCRIPTION("AMD ACP7.0 & ACP7.1 tables and support for ACPI enumeration");
159171
MODULE_LICENSE("GPL");
160172
MODULE_AUTHOR("Vijendar.Mukunda@amd.com");

sound/soc/amd/mach-config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sdw_machines[];
2727
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_sdw_machines[];
2828
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sof_machines[];
2929
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[];
30+
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sof_sdw_machines[];
3031

3132
struct config_entry {
3233
u32 flags;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ static const struct sof_amd_acp_desc acp70_chip_info = {
4848

4949
static const struct sof_dev_desc acp70_desc = {
5050
.machines = snd_soc_acpi_amd_acp70_sof_machines,
51+
.alt_machines = snd_soc_acpi_amd_acp70_sof_sdw_machines,
5152
.resindex_lpe_base = 0,
5253
.resindex_pcicfg_base = -1,
5354
.resindex_imr_base = -1,

0 commit comments

Comments
 (0)