Merge tag 'soundwire-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

Pull soundwire updates from Vinod Koul:

 - SoundWire multi lane support to use multiple lanes if supported

 - Stream handling of DEPREPARED state

 - AMD wake register programming for power off mode

* tag 'soundwire-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: amd: clear wake enable register for power off mode
  soundwire: generic_bandwidth_allocation: count the bandwidth of active streams only
  SoundWire: pass stream to compute_params()
  soundwire: generic_bandwidth_allocation: add lane in sdw_group_params
  soundwire: generic_bandwidth_allocation: select data lane
  soundwire: generic_bandwidth_allocation: check required freq accurately
  soundwire: generic_bandwidth_allocation: correct clk_freq check in sdw_select_row_col
  Soundwire: generic_bandwidth_allocation: set frame shape on fly
  Soundwire: stream: program BUSCLOCK_SCALE
  Soundwire: add sdw_slave_get_scale_index helper
  soundwire: generic_bandwidth_allocation: skip DEPREPARED streams
  soundwire: stream: set DEPREPARED state earlier
  soundwire: add lane_used_bandwidth in struct sdw_bus
  soundwire: mipi_disco: read lane mapping properties from ACPI
  soundwire: add lane field in sdw_port_runtime
  soundwire: bus: Move irq mapping cleanup into devres

diff --combined drivers/soundwire/amd_manager.c
index 96a7f9709720bb2a75b73079023d802d02d66f49,71b3cf2df89d496069c5fec29423d5c31dd3b728..5a54b10daf77a81e48ec76fccd38aa6a8351f01c
--- 1/drivers/soundwire/amd_manager.c
--- 2/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@@ -384,7 -384,7 +384,7 @@@ static u32 amd_sdw_read_ping_status(str
        return slave_stat;
  }
  
- static int amd_sdw_compute_params(struct sdw_bus *bus)
+ static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
  {
        struct sdw_transport_data t_data = {0};
        struct sdw_master_runtime *m_rt;
@@@ -410,7 -410,7 +410,7 @@@
                        sdw_fill_xport_params(&p_rt->transport_params, p_rt->num,
                                              false, SDW_BLK_GRP_CNT_1, sample_int,
                                              port_bo, port_bo >> 8, hstart, hstop,
-                                             SDW_BLK_PKG_PER_PORT, 0x0);
+                                             SDW_BLK_PKG_PER_PORT, p_rt->lane);
  
                        sdw_fill_port_params(&p_rt->port_params,
                                             p_rt->num, bps,
@@@ -1190,6 -1190,7 +1190,7 @@@ static int __maybe_unused amd_resume_ru
        if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
                return amd_sdw_clock_stop_exit(amd_manager);
        } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
+               writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
                val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL);
                if (val) {
                        val |= AMD_SDW_CLK_RESUME_REQ;
@@@ -1221,7 -1222,7 +1222,7 @@@ static const struct dev_pm_ops amd_pm 
  
  static struct platform_driver amd_sdw_driver = {
        .probe  = &amd_sdw_manager_probe,
 -      .remove_new = &amd_sdw_manager_remove,
 +      .remove = &amd_sdw_manager_remove,
        .driver = {
                .name   = "amd_sdw_manager",
                .pm = &amd_pm,

diff --combined drivers/soundwire/qcom.c
index e00c5ac496a6859c58354e02d5e4c6c31642e272,fd98f05bf56d12ac6f9ad79916ae766d1c7a3197..0f45e3404756f647e89afefb7b0e5836daa19e3c
--- 1/drivers/soundwire/qcom.c
--- 2/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@@ -1072,7 -1072,7 +1072,7 @@@ static const struct sdw_master_ops qcom
        .pre_bank_switch = qcom_swrm_pre_bank_switch,
  };
  
- static int qcom_swrm_compute_params(struct sdw_bus *bus)
+ static int qcom_swrm_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
  {
        struct qcom_swrm_ctrl *ctrl = to_qcom_sdw(bus);
        struct sdw_master_runtime *m_rt;
@@@ -1779,7 -1779,7 +1779,7 @@@ MODULE_DEVICE_TABLE(of, qcom_swrm_of_ma
  
  static struct platform_driver qcom_swrm_driver = {
        .probe  = &qcom_swrm_probe,
 -      .remove_new = qcom_swrm_remove,
 +      .remove = qcom_swrm_remove,
        .driver = {
                .name   = "qcom-soundwire",
                .of_match_table = qcom_swrm_of_match,