Merge tag 'i2c-host-fixes-6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current

Wolfram Sang · Wolfram Sang · commit 7e9bb0cb50fe · 2024-06-16T12:48:30.000+02:00
Two fixes from Jean aim to correctly report i2c functionality,
specifically ensuring that I2C_FUNC_SLAVE is reported when a
device operates solely as a slave interface.
diff --git a/drivers/i2c/busses/i2c-at91-slave.c b/drivers/i2c/busses/i2c-at91-slave.c
@@ -106,8 +106,7 @@ static int at91_unreg_slave(struct i2c_client *slave)
 
 static u32 at91_twi_func(struct i2c_adapter *adapter)
 {
-	return I2C_FUNC_SLAVE | I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL
-		| I2C_FUNC_SMBUS_READ_BLOCK_DATA;
+	return I2C_FUNC_SLAVE;
 }
 
 static const struct i2c_algorithm at91_twi_algorithm_slave = {
diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c
@@ -220,7 +220,7 @@ static const struct i2c_algorithm i2c_dw_algo = {
 
 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 |
 			 DW_IC_CON_RESTART_EN | DW_IC_CON_STOP_DET_IFADDRESSED;

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ static int at91_unreg_slave(struct i2c_client *slave)`
`106`	`106`
`107`	`107`	`static u32 at91_twi_func(struct i2c_adapter *adapter)`
`108`	`108`	`{`
`109`		`- return I2C_FUNC_SLAVE \| I2C_FUNC_I2C \| I2C_FUNC_SMBUS_EMUL`
`110`		`- \| I2C_FUNC_SMBUS_READ_BLOCK_DATA;`
	`109`	`+ return I2C_FUNC_SLAVE;`
`111`	`110`	`}`
`112`	`111`
`113`	`112`	`static const struct i2c_algorithm at91_twi_algorithm_slave = {`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ static const struct i2c_algorithm i2c_dw_algo = {`
`220`	`220`
`221`	`221`	`void i2c_dw_configure_slave(struct dw_i2c_dev *dev)`
`222`	`222`	`{`
`223`		`- dev->functionality = I2C_FUNC_SLAVE \| DW_IC_DEFAULT_FUNCTIONALITY;`
	`223`	`+ dev->functionality = I2C_FUNC_SLAVE;`
`224`	`224`
`225`	`225`	`dev->slave_cfg = DW_IC_CON_RX_FIFO_FULL_HLD_CTRL \|`
`226`	`226`	`DW_IC_CON_RESTART_EN \| DW_IC_CON_STOP_DET_IFADDRESSED;`