diff options
author | 2024-01-18 17:08:31 -0800 | |
---|---|---|
committer | 2024-01-18 17:08:31 -0800 | |
commit | 4d5d604cc48a7babeb30e97aeb443679415573af (patch) | |
tree | ee5a6d9beb27393da3ee0d7b2c365324c04b0c89 /drivers/soundwire/master.c | |
parent | Merge tag 'gpio-fixes-for-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | soundwire: amd: drop bus freq calculation and set 'max_clk_freq' (diff) | |
download | linux-4d5d604cc48a7babeb30e97aeb443679415573af.tar.gz linux-4d5d604cc48a7babeb30e97aeb443679415573af.tar.bz2 linux-4d5d604cc48a7babeb30e97aeb443679415573af.zip |
Merge tag 'soundwire-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire
Pull soundwire updates from Vinod Koul:
- Core: add concept of controller_id to deal with clear Controller /
Manager hierarchy
- bunch of qcom driver refactoring for qcom_swrm_stream_alloc_ports(),
qcom_swrm_stream_alloc_ports() and setting controller id to hw master
id
* tag 'soundwire-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
soundwire: amd: drop bus freq calculation and set 'max_clk_freq'
soundwire: generic_bandwidth_allocation use bus->params.max_dr_freq
soundwire: qcom: set controller id to hw master id
soundwire: fix initializing sysfs for same devices on different buses
soundwire: bus: introduce controller_id
soundwire: stream: constify sdw_port_config when adding devices
soundwire: qcom: move sconfig in qcom_swrm_stream_alloc_ports() out of critical section
soundwire: qcom: drop unneeded qcom_swrm_stream_alloc_ports() cleanup
Diffstat (limited to 'drivers/soundwire/master.c')
-rw-r--r-- | drivers/soundwire/master.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soundwire/master.c b/drivers/soundwire/master.c index 9b05c9e25ebe..51abedbbaa66 100644 --- a/drivers/soundwire/master.c +++ b/drivers/soundwire/master.c @@ -145,7 +145,7 @@ int sdw_master_device_add(struct sdw_bus *bus, struct device *parent, md->dev.fwnode = fwnode; md->dev.dma_mask = parent->dma_mask; - dev_set_name(&md->dev, "sdw-master-%d", bus->id); + dev_set_name(&md->dev, "sdw-master-%d-%d", bus->controller_id, bus->link_id); ret = device_register(&md->dev); if (ret) { |