Commit 4301487e authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'i2c-for-6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Two fixes to correctly report i2c functionality, ensuring that
  I2C_FUNC_SLAVE is reported when a device operates solely as a slave
  interface"

* tag 'i2c-for-6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: designware: Fix the functionality flags of the slave-only interface
  i2c: at91: Fix the functionality flags of the slave-only interface
parents b5beaa44 7e9bb0cb
...@@ -106,8 +106,7 @@ static int at91_unreg_slave(struct i2c_client *slave) ...@@ -106,8 +106,7 @@ static int at91_unreg_slave(struct i2c_client *slave)
static u32 at91_twi_func(struct i2c_adapter *adapter) static u32 at91_twi_func(struct i2c_adapter *adapter)
{ {
return I2C_FUNC_SLAVE | I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL return I2C_FUNC_SLAVE;
| I2C_FUNC_SMBUS_READ_BLOCK_DATA;
} }
static const struct i2c_algorithm at91_twi_algorithm_slave = { static const struct i2c_algorithm at91_twi_algorithm_slave = {
......
...@@ -220,7 +220,7 @@ static const struct i2c_algorithm i2c_dw_algo = { ...@@ -220,7 +220,7 @@ static const struct i2c_algorithm i2c_dw_algo = {
void i2c_dw_configure_slave(struct dw_i2c_dev *dev) void i2c_dw_configure_slave(struct dw_i2c_dev *dev)
{ {
dev->functionality = I2C_FUNC_SLAVE | DW_IC_DEFAULT_FUNCTIONALITY; dev->functionality = I2C_FUNC_SLAVE;
dev->slave_cfg = DW_IC_CON_RX_FIFO_FULL_HLD_CTRL | dev->slave_cfg = DW_IC_CON_RX_FIFO_FULL_HLD_CTRL |
DW_IC_CON_RESTART_EN | DW_IC_CON_STOP_DET_IFADDRESSED; DW_IC_CON_RESTART_EN | DW_IC_CON_STOP_DET_IFADDRESSED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment