summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-07-01 08:34:15 +0200
committerTakashi Iwai <tiwai@suse.de>2021-07-01 08:34:15 +0200
commit498386d1c4d98a72db7a2f51473593ad563b45ae (patch)
treef94e6b211b9a50106e6e047cd992ae3e209ef007 /include/linux
parent5c6d4f97267f02f47acea8a652265348ec12de51 (diff)
parentdfc2e8ae4066a95c7f9c2bb2dfa26651feaa6b83 (diff)
downloadcachepc-linux-498386d1c4d98a72db7a2f51473593ad563b45ae.tar.gz
cachepc-linux-498386d1c4d98a72db7a2f51473593ad563b45ae.zip
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/soundwire/sdw.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index ced07f8fde87..de9802a24e7e 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -1041,6 +1041,9 @@ int sdw_write_no_pm(struct sdw_slave *slave, u32 addr, u8 value);
int sdw_read_no_pm(struct sdw_slave *slave, u32 addr);
int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val);
int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, u8 *val);
+int sdw_update(struct sdw_slave *slave, u32 addr, u8 mask, u8 val);
+int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val);
+
int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id);
void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id);