Skip to content

Commit a115ab9

Browse files
plbossartbroonie
authored andcommitted
ASoC: SOF: Intel: add build support for SoundWire
Select SoundWire capabilities on newer Intel platforms, starting with CannonLake/CoffeeLake/CometLake. As done for HDaudio, the SoundWire link is an opt-in capability. We explicitly test for ACPI to avoid warnings on unmet dependencies on the SoundWire side. Signed-off-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Bard Liao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 1e15dd6 commit a115ab9

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

sound/soc/sof/intel/Kconfig

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ config SND_SOC_SOF_CANNONLAKE_SUPPORT
166166
config SND_SOC_SOF_CANNONLAKE
167167
tristate
168168
select SND_SOC_SOF_HDA_COMMON
169+
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
169170
help
170171
This option is not user-selectable but automagically handled by
171172
'select' statements at a higher level
@@ -181,6 +182,7 @@ config SND_SOC_SOF_COFFEELAKE_SUPPORT
181182
config SND_SOC_SOF_COFFEELAKE
182183
tristate
183184
select SND_SOC_SOF_HDA_COMMON
185+
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
184186
help
185187
This option is not user-selectable but automagically handled by
186188
'select' statements at a higher level
@@ -196,13 +198,15 @@ config SND_SOC_SOF_ICELAKE_SUPPORT
196198
config SND_SOC_SOF_ICELAKE
197199
tristate
198200
select SND_SOC_SOF_HDA_COMMON
201+
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
199202
help
200203
This option is not user-selectable but automagically handled by
201204
'select' statements at a higher level
202205

203206
config SND_SOC_SOF_COMETLAKE
204207
tristate
205208
select SND_SOC_SOF_HDA_COMMON
209+
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
206210
help
207211
This option is not user-selectable but automagically handled by
208212
'select' statements at a higher level
@@ -229,6 +233,7 @@ config SND_SOC_SOF_TIGERLAKE_SUPPORT
229233
config SND_SOC_SOF_TIGERLAKE
230234
tristate
231235
select SND_SOC_SOF_HDA_COMMON
236+
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
232237
help
233238
This option is not user-selectable but automagically handled by
234239
'select' statements at a higher level
@@ -244,6 +249,7 @@ config SND_SOC_SOF_ELKHARTLAKE_SUPPORT
244249
config SND_SOC_SOF_ELKHARTLAKE
245250
tristate
246251
select SND_SOC_SOF_HDA_COMMON
252+
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
247253
help
248254
This option is not user-selectable but automagically handled by
249255
'select' statements at a higher level
@@ -329,6 +335,29 @@ config SND_SOC_SOF_HDA
329335
This option is not user-selectable but automagically handled by
330336
'select' statements at a higher level
331337

338+
config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK
339+
bool "SOF support for SoundWire"
340+
depends on SOUNDWIRE && ACPI
341+
help
342+
This adds support for SoundWire with Sound Open Firmware
343+
for Intel(R) platforms.
344+
Say Y if you want to enable SoundWire links with SOF.
345+
If unsure select "N".
346+
347+
config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
348+
tristate
349+
select SND_SOC_SOF_INTEL_SOUNDWIRE if SND_SOC_SOF_INTEL_SOUNDWIRE_LINK
350+
help
351+
This option is not user-selectable but automagically handled by
352+
'select' statements at a higher level
353+
354+
config SND_SOC_SOF_INTEL_SOUNDWIRE
355+
tristate
356+
select SOUNDWIRE_INTEL
357+
help
358+
This option is not user-selectable but automagically handled by
359+
'select' statements at a higher level
360+
332361
endif ## SND_SOC_SOF_INTEL_PCI
333362

334363
endif ## SND_SOC_SOF_INTEL_TOPLEVEL

0 commit comments

Comments
 (0)