Skip to content

Commit 4301487

Browse files
committed
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
2 parents b5beaa4 + 7e9bb0c commit 4301487

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

drivers/i2c/busses/i2c-at91-slave.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ static int at91_unreg_slave(struct i2c_client *slave)
106106

107107
static u32 at91_twi_func(struct i2c_adapter *adapter)
108108
{
109-
return I2C_FUNC_SLAVE | I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL
110-
| I2C_FUNC_SMBUS_READ_BLOCK_DATA;
109+
return I2C_FUNC_SLAVE;
111110
}
112111

113112
static const struct i2c_algorithm at91_twi_algorithm_slave = {

drivers/i2c/busses/i2c-designware-slave.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static const struct i2c_algorithm i2c_dw_algo = {
220220

221221
void i2c_dw_configure_slave(struct dw_i2c_dev *dev)
222222
{
223-
dev->functionality = I2C_FUNC_SLAVE | DW_IC_DEFAULT_FUNCTIONALITY;
223+
dev->functionality = I2C_FUNC_SLAVE;
224224

225225
dev->slave_cfg = DW_IC_CON_RX_FIFO_FULL_HLD_CTRL |
226226
DW_IC_CON_RESTART_EN | DW_IC_CON_STOP_DET_IFADDRESSED;

0 commit comments

Comments
 (0)