diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-02 14:55:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-02 14:55:06 +0100 |
| commit | c075a0c0f102a23f01dc9b5684b412604da25629 (patch) | |
| tree | 372ee5fd779ae24ff8242b145bfe4c42f624bafe /include | |
| parent | Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| parent | soundwire: SDCA: detect sdca_cascade interrupt (diff) | |
| download | linux-c075a0c0f102a23f01dc9b5684b412604da25629.tar.xz linux-c075a0c0f102a23f01dc9b5684b412604da25629.zip | |
Merge tag 'soundwire-for-asoc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into asoc-5.11
soundwire-for-asoc-5.11
Tag for asoc to resolve build dependency with commit b7cab9be7c16
("soundwire: SDCA: detect sdca_cascade interrupt")
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/soundwire/sdw.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 41cc1192f9aa..f0b01b728640 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -359,6 +359,7 @@ struct sdw_dpn_prop { * @sink_dpn_prop: Sink Data Port N properties * @scp_int1_mask: SCP_INT1_MASK desired settings * @quirks: bitmask identifying deltas from the MIPI specification + * @is_sdca: the Slave supports the SDCA specification */ struct sdw_slave_prop { u32 mipi_revision; @@ -382,6 +383,7 @@ struct sdw_slave_prop { struct sdw_dpn_prop *sink_dpn_prop; u8 scp_int1_mask; u32 quirks; + bool is_sdca; }; #define SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY BIT(0) @@ -479,10 +481,12 @@ struct sdw_slave_id { /** * struct sdw_slave_intr_status - Slave interrupt status + * @sdca_cascade: set if the Slave device reports an SDCA interrupt * @control_port: control port status * @port: data port status */ struct sdw_slave_intr_status { + bool sdca_cascade; u8 control_port; u8 port[15]; }; |