Skip to content

Commit b4a0ca1

Browse files
Wolfram SangAndi Shyti
authored andcommitted
i2c: owl: reword according to newest specification
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 <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andi Shyti <[email protected]>
1 parent 7947d18 commit b4a0ca1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/i2c/busses/i2c-owl.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static void owl_i2c_xfer_data(struct owl_i2c_dev *i2c_dev)
172172

173173
i2c_dev->err = 0;
174174

175-
/* Handle NACK from slave */
175+
/* Handle NACK from target */
176176
fifostat = readl(i2c_dev->base + OWL_I2C_REG_FIFOSTAT);
177177
if (fifostat & OWL_I2C_FIFOSTAT_RNB) {
178178
i2c_dev->err = -ENXIO;
@@ -302,7 +302,7 @@ static int owl_i2c_xfer_common(struct i2c_adapter *adap, struct i2c_msg *msgs,
302302
OWL_I2C_CTL_IRQE, !atomic);
303303

304304
/*
305-
* Select: FIFO enable, Master mode, Stop enable, Data count enable,
305+
* Select: FIFO enable, controller mode, Stop enable, Data count enable,
306306
* Send start bit
307307
*/
308308
i2c_cmd = OWL_I2C_CMD_SECL | OWL_I2C_CMD_MSS | OWL_I2C_CMD_SE |
@@ -314,7 +314,7 @@ static int owl_i2c_xfer_common(struct i2c_adapter *adap, struct i2c_msg *msgs,
314314
i2c_cmd |= OWL_I2C_CMD_AS(msgs[0].len + 1) |
315315
OWL_I2C_CMD_SAS(1) | OWL_I2C_CMD_RBE;
316316

317-
/* Write slave address */
317+
/* Write target address */
318318
addr = i2c_8bit_addr_from_msg(&msgs[0]);
319319
writel(addr, i2c_dev->base + OWL_I2C_REG_TXDAT);
320320

@@ -420,9 +420,9 @@ static int owl_i2c_xfer_atomic(struct i2c_adapter *adap,
420420
}
421421

422422
static const struct i2c_algorithm owl_i2c_algorithm = {
423-
.master_xfer = owl_i2c_xfer,
424-
.master_xfer_atomic = owl_i2c_xfer_atomic,
425-
.functionality = owl_i2c_func,
423+
.xfer = owl_i2c_xfer,
424+
.xfer_atomic = owl_i2c_xfer_atomic,
425+
.functionality = owl_i2c_func,
426426
};
427427

428428
static const struct i2c_adapter_quirks owl_i2c_quirks = {

0 commit comments

Comments
 (0)