Skip to content

Commit 4c9818d

Browse files
committed
Merge tag 'soundwire-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire
Pull soundwire updates from Vinod Koul: "This features AMD soundwire controller driver, a bunch of Intel changes for future platform support, sdw API updates etc: - Support for AMD soundwire controller - Intel driver updates to support future platforms - Core API sdw_nread/nwrite_no_pm updates to handle page boundaries" * tag 'soundwire-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire: (38 commits) soundwire: intel_auxdevice: improve pm_prepare step soundwire: bus: Fix unbalanced pm_runtime_put() causing usage count underflow soundwire: intel: don't save hw_params for use in prepare soundwire: bus: Update sdw_nread/nwrite_no_pm to handle page boundaries soundwire: bus: Update kernel doc for no_pm functions soundwire: bus: Remove now outdated comments on no_pm IO soundwire: stream: uniquify dev_err() logs soundwire: stream: remove bus->dev from logs on multiple buses soundwire: amd: add pm_prepare callback and pm ops support soundwire: amd: handle SoundWire wake enable interrupt soundwire: amd: add runtime pm ops for AMD SoundWire manager driver soundwire: amd: add SoundWire manager interrupt handling soundwire: amd: enable build for AMD SoundWire manager driver soundwire: amd: register SoundWire manager dai ops soundwire: amd: Add support for AMD Manager driver soundwire: export sdw_compute_slave_ports() function soundwire: stream: restore cumulative bus bandwidth when compute_params callback failed soundwire: bandwidth allocation: Use hweight32() to calculate set bits soundwire: qcom: gracefully handle too many ports in DT soundwire: qcom: define hardcoded version magic numbers ...
2 parents 54bdf8a + 67572c8 commit 4c9818d

18 files changed

Lines changed: 2189 additions & 438 deletions

drivers/soundwire/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ if SOUNDWIRE
1818

1919
comment "SoundWire Devices"
2020

21+
config SOUNDWIRE_AMD
22+
tristate "AMD SoundWire Manager driver"
23+
select SOUNDWIRE_GENERIC_ALLOCATION
24+
depends on ACPI && SND_SOC
25+
help
26+
SoundWire AMD Manager driver.
27+
If you have an AMD platform which has a SoundWire Manager then
28+
enable this config option to get the SoundWire support for that
29+
device.
30+
2131
config SOUNDWIRE_CADENCE
2232
tristate
2333

drivers/soundwire/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,17 @@ ifdef CONFIG_DEBUG_FS
1515
soundwire-bus-y += debugfs.o
1616
endif
1717

18+
#AMD driver
19+
soundwire-amd-y := amd_manager.o
20+
obj-$(CONFIG_SOUNDWIRE_AMD) += soundwire-amd.o
21+
1822
#Cadence Objs
1923
soundwire-cadence-y := cadence_master.o
2024
obj-$(CONFIG_SOUNDWIRE_CADENCE) += soundwire-cadence.o
2125

2226
#Intel driver
23-
soundwire-intel-y := intel.o intel_auxdevice.o intel_init.o dmi-quirks.o
27+
soundwire-intel-y := intel.o intel_auxdevice.o intel_init.o dmi-quirks.o \
28+
intel_bus_common.o
2429
obj-$(CONFIG_SOUNDWIRE_INTEL) += soundwire-intel.o
2530

2631
#Qualcomm driver

0 commit comments

Comments
 (0)