kevin/linux
1
Fork 0
Code

i2c: octeon: reword according to newest specification

Browse Source 
Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2
specifications and replace "master/slave" with more appropriate terms.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
This commit is contained in:
Wolfram Sang 2024-07-06 13:20:34 +02:00 committed by Andi Shyti
parent 5a078b4f1f
commit 9881aac5aa
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/i2c/busses/i2c-octeon-core.c
View File

@ -221,14 +221,14 @@ static int octeon_i2c_check_status(struct octeon_i2c *i2c, int final_read)
case STAT_LOST_ARB_B0: case STAT_LOST_ARB_B0:
return -EAGAIN; return -EAGAIN;
/* Being addressed as slave, should back off & listen */ /* Being addressed as local target, should back off & listen */
case STAT_SLAVE_60: case STAT_SLAVE_60:
case STAT_SLAVE_70: case STAT_SLAVE_70:
case STAT_GENDATA_ACK: case STAT_GENDATA_ACK:
case STAT_GENDATA_NAK: case STAT_GENDATA_NAK:
return -EOPNOTSUPP; return -EOPNOTSUPP;
/* Core busy as slave */ /* Core busy as local target */
case STAT_SLAVE_80: case STAT_SLAVE_80:
case STAT_SLAVE_88: case STAT_SLAVE_88:
case STAT_SLAVE_A0: case STAT_SLAVE_A0:
@ -608,7 +608,7 @@ err:
} }
/** /**
* octeon_i2c_xfer - The driver's master_xfer function * octeon_i2c_xfer - The driver's xfer function
* @adap: Pointer to the i2c_adapter structure * @adap: Pointer to the i2c_adapter structure
* @msgs: Pointer to the messages to be processed * @msgs: Pointer to the messages to be processed
* @num: Length of the MSGS array * @num: Length of the MSGS array

4
drivers/i2c/busses/i2c-octeon-core.h
View File

@ -39,8 +39,8 @@
/* Controller command and status bits */ /* Controller command and status bits */
#define TWSI_CTL_CE 0x80 /* High level controller enable */ #define TWSI_CTL_CE 0x80 /* High level controller enable */
#define TWSI_CTL_ENAB 0x40 /* Bus enable */ #define TWSI_CTL_ENAB 0x40 /* Bus enable */
#define TWSI_CTL_STA 0x20 /* Master-mode start, HW clears when done */ #define TWSI_CTL_STA 0x20 /* Controller-mode start, HW clears when done */
#define TWSI_CTL_STP 0x10 /* Master-mode stop, HW clears when done */ #define TWSI_CTL_STP 0x10 /* Controller-mode stop, HW clears when done */
#define TWSI_CTL_IFLG 0x08 /* HW event, SW writes 0 to ACK */ #define TWSI_CTL_IFLG 0x08 /* HW event, SW writes 0 to ACK */
#define TWSI_CTL_AAK 0x04 /* Assert ACK */ #define TWSI_CTL_AAK 0x04 /* Assert ACK */

2
drivers/i2c/busses/i2c-octeon-platdrv.c
View File

@ -122,7 +122,7 @@ static u32 octeon_i2c_functionality(struct i2c_adapter *adap)
} }
static const struct i2c_algorithm octeon_i2c_algo = { static const struct i2c_algorithm octeon_i2c_algo = {
.master_xfer = octeon_i2c_xfer, .xfer = octeon_i2c_xfer,
.functionality = octeon_i2c_functionality, .functionality = octeon_i2c_functionality,
}; };