Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <wsa+renesas@sang-engineering.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>

authored by

Wolfram Sang and committed by
Andi Shyti
b4a0ca13 7947d187

+6 -6
+6 -6
drivers/i2c/busses/i2c-owl.c
··· 172 172 173 173 i2c_dev->err = 0; 174 174 175 - /* Handle NACK from slave */ 175 + /* Handle NACK from target */ 176 176 fifostat = readl(i2c_dev->base + OWL_I2C_REG_FIFOSTAT); 177 177 if (fifostat & OWL_I2C_FIFOSTAT_RNB) { 178 178 i2c_dev->err = -ENXIO; ··· 302 302 OWL_I2C_CTL_IRQE, !atomic); 303 303 304 304 /* 305 - * Select: FIFO enable, Master mode, Stop enable, Data count enable, 305 + * Select: FIFO enable, controller mode, Stop enable, Data count enable, 306 306 * Send start bit 307 307 */ 308 308 i2c_cmd = OWL_I2C_CMD_SECL | OWL_I2C_CMD_MSS | OWL_I2C_CMD_SE | ··· 314 314 i2c_cmd |= OWL_I2C_CMD_AS(msgs[0].len + 1) | 315 315 OWL_I2C_CMD_SAS(1) | OWL_I2C_CMD_RBE; 316 316 317 - /* Write slave address */ 317 + /* Write target address */ 318 318 addr = i2c_8bit_addr_from_msg(&msgs[0]); 319 319 writel(addr, i2c_dev->base + OWL_I2C_REG_TXDAT); 320 320 ··· 420 420 } 421 421 422 422 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, 426 426 }; 427 427 428 428 static const struct i2c_adapter_quirks owl_i2c_quirks = {