Skip to content

Commit f3f9f0d

Browse files
committed
Add generic AMD Soundwire machine driver for Legacy(No
Merge series from Vijendar Mukunda <Vijendar.Mukunda@amd.com>: This patch series add SoundWire machines for RT711, RT714, RT1316 and RT722 codecs for ACP 6.3 platform. Also, it adds a generic SoundWire machine driver code for legacy(No DSP) stack.
2 parents a593604 + 76b5a3b commit f3f9f0d

File tree

10 files changed

+646
-48
lines changed

10 files changed

+646
-48
lines changed

sound/soc/amd/acp/Kconfig

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,17 @@ config SND_SOC_AMD_SOF_MACH
119119
help
120120
This option enables SOF sound card support for ACP audio.
121121

122+
config SND_SOC_AMD_SDW_MACH_COMMON
123+
tristate
124+
help
125+
This option enables common SoundWire Machine driver module for
126+
AMD platforms.
127+
122128
config SND_SOC_AMD_SOF_SDW_MACH
123129
tristate "AMD SOF Soundwire Machine Driver Support"
124130
depends on X86 && PCI && ACPI
125131
depends on SOUNDWIRE
132+
select SND_SOC_AMD_SDW_MACH_COMMON
126133
select SND_SOC_SDW_UTILS
127134
select SND_SOC_DMIC
128135
select SND_SOC_RT711_SDW
@@ -137,6 +144,28 @@ config SND_SOC_AMD_SOF_SDW_MACH
137144
on AMD platform.
138145
If unsure select "N".
139146

147+
config SND_SOC_AMD_LEGACY_SDW_MACH
148+
tristate "AMD Legacy(No DSP) Soundwire Machine Driver Support"
149+
depends on X86 && PCI && ACPI
150+
depends on SOUNDWIRE
151+
select SND_SOC_AMD_SDW_MACH_COMMON
152+
select SND_SOC_SDW_UTILS
153+
select SND_SOC_DMIC
154+
select SND_SOC_RT711_SDW
155+
select SND_SOC_RT711_SDCA_SDW
156+
select SND_SOC_RT712_SDCA_SDW
157+
select SND_SOC_RT712_SDCA_DMIC_SDW
158+
select SND_SOC_RT1316_SDW
159+
select SND_SOC_RT715_SDW
160+
select SND_SOC_RT715_SDCA_SDW
161+
select SND_SOC_RT722_SDCA_SDW
162+
help
163+
This option enables Legacy(No DSP) sound card support for SoundWire
164+
enabled AMD platforms along with ACP PDM controller.
165+
Say Y if you want to enable SoundWire based machine driver support
166+
on AMD platform.
167+
If unsure select "N".
168+
140169
endif # SND_SOC_AMD_ACP_COMMON
141170

142171
config SND_AMD_SOUNDWIRE_ACPI

sound/soc/amd/acp/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ snd-acp-mach-y := acp-mach-common.o
2323
snd-acp-legacy-mach-y := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o
2424
snd-acp-sof-mach-y := acp-sof-mach.o
2525
snd-soc-acpi-amd-match-y := amd-acp63-acpi-match.o
26+
snd-acp-sdw-mach-y := acp-sdw-mach-common.o
2627
snd-acp-sdw-sof-mach-y += acp-sdw-sof-mach.o
28+
snd-acp-sdw-legacy-mach-y += acp-sdw-legacy-mach.o
2729

2830
obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o
2931
obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o
@@ -41,4 +43,6 @@ obj-$(CONFIG_SND_SOC_AMD_MACH_COMMON) += snd-acp-mach.o
4143
obj-$(CONFIG_SND_SOC_AMD_LEGACY_MACH) += snd-acp-legacy-mach.o
4244
obj-$(CONFIG_SND_SOC_AMD_SOF_MACH) += snd-acp-sof-mach.o
4345
obj-$(CONFIG_SND_SOC_ACPI_AMD_MATCH) += snd-soc-acpi-amd-match.o
46+
obj-$(CONFIG_SND_SOC_AMD_SDW_MACH_COMMON) += snd-acp-sdw-mach.o
4447
obj-$(CONFIG_SND_SOC_AMD_SOF_SDW_MACH) += snd-acp-sdw-sof-mach.o
48+
obj-$(CONFIG_SND_SOC_AMD_LEGACY_SDW_MACH) += snd-acp-sdw-legacy-mach.o

0 commit comments

Comments
 (0)