diff options
| author | Linus Torvalds | 2023-05-01 11:08:01 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2023-05-01 11:08:01 -0700 |
| commit | e0906f1feb7caf5098e7f831f4889feecfb0c68b (patch) | |
| tree | 9c1bfe62ceb60a0f66df154a20b90c59ef2dbc56 /include/linux | |
| parent | 06936aaf490ff55dd5787375a83d6e486bccc397 (diff) | |
| parent | 6b496a94c5905fca7879bc0dc438a47de40b7d4f (diff) | |
Merge tag 'i3c/for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
Pull i3c updates from Alexandre Belloni:
"Subsystem:
- OF alias bus numbering
- convert to platform remove callback returning void
New driver:
- AST2600 controller, based on Synopsys DesignWare IP
Driver update:
- dw: add infrastructure to support different platform integrations"
* tag 'i3c/for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
i3c: ast2600: set variable ast2600_i3c_ops storage-class-specifier to static
i3c: ast2600: fix register setting for 545 ohm pullups
i3c: ast2600: enable IBI support
i3c: dw: Add a platform facility for IBI PEC workarounds
i3c: dw: Add support for in-band interrupts
i3c: dw: Turn DAT array entry into a struct
i3c: dw: Create a generic fifo read function
i3c: Allow OF-alias-based persistent bus numbering
i3c: ast2600: Add AST2600 platform-specific driver
dt-bindings: i3c: Add AST2600 i3c controller
i3c: dw: Add infrastructure for platform-specific implementations
i3c: dw: use bus mode rather than device reg for conditional tCAS setting
i3c: dw: Return the length from a read priv_xfer
i3c: svc: Convert to platform remove callback returning void
i3c: mipi-i3c-hci: Convert to platform remove callback returning void
i3c: cdns: Convert to platform remove callback returning void
i3c: dw: Convert to platform remove callback returning void
i3c: Make i3c_master_unregister() return void
i3c: dw: drop of_match_ptr for ID table
i3c: Correct reference to the I²C device data type
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i3c/master.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h index 604a126b78c8..0b52da4f2346 100644 --- a/include/linux/i3c/master.h +++ b/include/linux/i3c/master.h @@ -22,9 +22,10 @@ #define I3C_BROADCAST_ADDR 0x7e #define I3C_MAX_ADDR GENMASK(6, 0) +struct i2c_client; + struct i3c_master_controller; struct i3c_bus; -struct i2c_device; struct i3c_device; /** @@ -541,7 +542,7 @@ int i3c_master_register(struct i3c_master_controller *master, struct device *parent, const struct i3c_master_controller_ops *ops, bool secondary); -int i3c_master_unregister(struct i3c_master_controller *master); +void i3c_master_unregister(struct i3c_master_controller *master); /** * i3c_dev_get_master_data() - get master private data attached to an I3C |