Merge tag 'hid-for-linus-2024020101' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / include / linux / soundwire / sdw.h

diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index 4f3d14bb15385a2860e4e1ee54738f60eb7c1b06..66f814b63a435f65bcdf8743d7adbfde39ca7ad7 100644 (file)
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -886,7 +886,8 @@ struct sdw_master_ops {
  * struct sdw_bus - SoundWire bus
  * @dev: Shortcut to &bus->md->dev to avoid changing the entire code.
  * @md: Master device
- * @link_id: Link id number, can be 0 to N, unique for each Master
+ * @controller_id: system-unique controller ID. If set to -1, the bus @id will be used.
+ * @link_id: Link id number, can be 0 to N, unique for each Controller
  * @id: bus system-wide unique id
  * @slaves: list of Slaves on this bus
  * @assigned: Bitmap for Slave device numbers.
@@ -918,6 +919,7 @@ struct sdw_master_ops {
 struct sdw_bus {
        struct device *dev;
        struct sdw_master_device *md;
+       int controller_id;
        unsigned int link_id;
        int id;
        struct list_head slaves;
@@ -1040,7 +1042,7 @@ int sdw_compute_params(struct sdw_bus *bus);
 
 int sdw_stream_add_master(struct sdw_bus *bus,
                struct sdw_stream_config *stream_config,
-               struct sdw_port_config *port_config,
+               const struct sdw_port_config *port_config,
                unsigned int num_ports,
                struct sdw_stream_runtime *stream);
 int sdw_stream_remove_master(struct sdw_bus *bus,
@@ -1062,7 +1064,7 @@ void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id
 
 int sdw_stream_add_slave(struct sdw_slave *slave,
                         struct sdw_stream_config *stream_config,
-                        struct sdw_port_config *port_config,
+                        const struct sdw_port_config *port_config,
                         unsigned int num_ports,
                         struct sdw_stream_runtime *stream);
 int sdw_stream_remove_slave(struct sdw_slave *slave,
@@ -1084,7 +1086,7 @@ int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val);
 
 static inline int sdw_stream_add_slave(struct sdw_slave *slave,
                                       struct sdw_stream_config *stream_config,
-                                      struct sdw_port_config *port_config,
+                                      const struct sdw_port_config *port_config,
                                       unsigned int num_ports,
                                       struct sdw_stream_runtime *stream)
 {