Merge tag 'core-debugobjects-2023-05-06' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / drivers / soundwire / cadence_master.h

diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h
index dec0b4f993c1a8d518ac4d20b1e00b61dc495b21..27c56274217f0ea30c90d93ea9cb13bd702c5a53 100644 (file)
--- a/drivers/soundwire/cadence_master.h
+++ b/drivers/soundwire/cadence_master.h
@@ -84,7 +84,6 @@ struct sdw_cdns_stream_config {
  * @bus: Bus handle
  * @stream_type: Stream type
  * @link_id: Master link id
- * @hw_params: hw_params to be applied in .prepare step
  * @suspended: status set when suspended, to be used in .prepare
  * @paused: status set in .trigger, to be used in suspend
  * @direction: stream direction
@@ -96,7 +95,6 @@ struct sdw_cdns_dai_runtime {
        struct sdw_bus *bus;
        enum sdw_stream_type stream_type;
        int link_id;
-       struct snd_pcm_hw_params *hw_params;
        bool suspended;
        bool paused;
        int direction;
@@ -107,6 +105,7 @@ struct sdw_cdns_dai_runtime {
  * @dev: Linux device
  * @bus: Bus handle
  * @instance: instance number
+ * @ip_offset: version-dependent offset to access IP_MCP registers and fields
  * @response_buf: SoundWire response buffer
  * @tx_complete: Tx completion
  * @ports: Data ports
@@ -122,6 +121,8 @@ struct sdw_cdns {
        struct sdw_bus bus;
        unsigned int instance;
 
+       u32 ip_offset;
+
        /*
         * The datasheet says the RX FIFO AVAIL can be 2 entries more
         * than the FIFO capacity, so allow for this.