From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Oct 2022 23:13:55 +0000 (-0700)
Subject: Merge tag 'soundwire-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul... 
X-Git-Tag: block-6.1-2022-13-10~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=881eccbef52563feb4fde0d19d375884798783f7;p=linux-block.git

Merge tag 'soundwire-6.1-rc1' of git://git./linux/kernel/git/vkoul/soundwire

Pull soundwire updates from Vinod Koul:
 "Updates for Intel, Cadence and Qualcomm drivers:

   - another round of Intel driver cleanup to prepare for future code
     reorg which is expected in next cycle (Pierre-Louis Bossart)

   - bus unattach notifications processing during re-enumeration along
     with Cadence driver updates for this (Richard Fitzgerald)

   - Qualcomm driver updates to handle device0 status (Srinivas
     Kandagatla)"

* tag 'soundwire-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire: (42 commits)
  soundwire: intel: add helper to stop bus
  soundwire: intel: introduce helpers to start bus
  soundwire: intel: introduce intel_shim_check_wake() helper
  soundwire: intel: simplify read ops assignment
  soundwire: intel: remove intel_init() wrapper
  soundwire: intel: move shim initialization before power up/down
  soundwire: intel: remove clock_stop parameter in intel_shim_init()
  soundwire: intel: move all PDI initialization under intel_register_dai()
  soundwire: intel: move DAI registration and debugfs init earlier
  soundwire: intel: simplify flow and use devm_ for DAI registration
  soundwire: intel: fix error handling on dai registration issues
  soundwire: cadence: Simplify error paths in cdns_xfer_msg()
  soundwire: cadence: Fix error check in cdns_xfer_msg()
  soundwire: cadence: Write to correct address for each FIFO chunk
  soundwire: bus: Fix wrong port number in sdw_handle_slave_alerts()
  soundwire: qcom: do not send status of device 0 during alert
  soundwire: qcom: update status from device id 1
  soundwire: cadence: Don't overwrite msg->buf during write commands
  soundwire: bus: Don't exit early if no device IDs were programmed
  soundwire: cadence: Fix lost ATTACHED interrupts when enumerating
  ...
---

881eccbef52563feb4fde0d19d375884798783f7
diff --cc drivers/soundwire/intel.c
index a5965e8827b9,15fe083e0402..244209358784
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@@ -1262,23 -1480,8 +1480,9 @@@ static struct sdw_master_ops sdw_intel_
  	.set_bus_conf = cdns_bus_conf,
  	.pre_bank_switch = intel_pre_bank_switch,
  	.post_bank_switch = intel_post_bank_switch,
 +	.read_ping_status = cdns_read_ping_status,
  };
  
- static int intel_init(struct sdw_intel *sdw)
- {
- 	bool clock_stop;
- 
- 	/* Initialize shim and controller */
- 	intel_link_power_up(sdw);
- 
- 	clock_stop = sdw_cdns_is_clock_stop(&sdw->cdns);
- 
- 	intel_shim_init(sdw, clock_stop);
- 
- 	return 0;
- }
- 
  /*
   * probe and init (aux_dev_id argument is required by function prototype but not used)
   */