Re: [PATCH 47/64] i2c: rk3x: reword according to newest specification

Heiko Stübner
2024-03-22T13:51:16Z

Am Freitag, 22. März 2024, 14:25:40 CET schrieb Wolfram Sang:
> Match the wording of this driver wrt. the newest I2C v7, SMBus 3.2, I3C
> specifications and replace "master/slave" with more appropriate terms.
> They are also more specific because we distinguish now between a remote
> entity ("client") and a local one ("target").
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Heiko Stuebner <heiko@sntech.de>

> ---
> drivers/i2c/busses/i2c-rk3x.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
> index 086fdf262e7b..01febd886bdd 100644
> --- a/drivers/i2c/busses/i2c-rk3x.c
> +++ b/drivers/i2c/busses/i2c-rk3x.c
> @@ -28,8 +28,8 @@
> /* Register Map */
> #define REG_CON 0x00 /* control register */
> #define REG_CLKDIV 0x04 /* clock divisor register */
> -#define REG_MRXADDR 0x08 /* slave address for REGISTER_TX */
> -#define REG_MRXRADDR 0x0c /* slave register address for REGISTER_TX */
> +#define REG_MRXADDR 0x08 /* client address for REGISTER_TX */
> +#define REG_MRXRADDR 0x0c /* client register address for REGISTER_TX */
> #define REG_MTXCNT 0x10 /* number of bytes to be transmitted */
> #define REG_MRXCNT 0x14 /* number of bytes to be received */
> #define REG_IEN 0x18 /* interrupt enable */
> @@ -68,8 +68,8 @@ enum {
> /* REG_IEN/REG_IPD bits */
> #define REG_INT_BTF BIT(0) /* a byte was transmitted */
> #define REG_INT_BRF BIT(1) /* a byte was received */
> -#define REG_INT_MBTF BIT(2) /* master data transmit finished */
> -#define REG_INT_MBRF BIT(3) /* master data receive finished */
> +#define REG_INT_MBTF BIT(2) /* host data transmit finished */
> +#define REG_INT_MBRF BIT(3) /* host data receive finished */
> #define REG_INT_START BIT(4) /* START condition generated */
> #define REG_INT_STOP BIT(5) /* STOP condition generated */
> #define REG_INT_NAKRCV BIT(6) /* NACK received */
> @@ -184,7 +184,7 @@ struct rk3x_i2c_soc_data {
> * @wait: the waitqueue to wait for i2c transfer
> * @busy: the condition for the event to wait for
> * @msg: current i2c message
> - * @addr: addr of i2c slave device
> + * @addr: addr of i2c client device
> * @mode: mode of i2c transfer
> * @is_last_msg: flag determines whether it is the last msg in this transfer
> * @state: state of i2c transfer
> @@ -979,7 +979,7 @@ static int rk3x_i2c_setup(struct rk3x_i2c *i2c, struct i2c_msg *msgs, int num)
> /*
> * The I2C adapter can issue a small (len < 4) write packet before
> * reading. This speeds up SMBus-style register reads.
> - * The MRXADDR/MRXRADDR hold the slave address and the slave register
> + * The MRXADDR/MRXRADDR hold the client address and the client register
> * address in this case.
> */
>
> @@ -1016,7 +1016,7 @@ static int rk3x_i2c_setup(struct rk3x_i2c *i2c, struct i2c_msg *msgs, int num)
> addr |= 1; /* set read bit */
>
> /*
> - * We have to transmit the slave addr first. Use
> + * We have to transmit the client addr first. Use
> * MOD_REGISTER_TX for that purpose.
> */
> i2c->mode = REG_CON_MOD_REGISTER_TX;
> @@ -1162,8 +1162,8 @@ static u32 rk3x_i2c_func(struct i2c_adapter *adap)
> }
>
> static const struct i2c_algorithm rk3x_i2c_algorithm = {
> - .master_xfer = rk3x_i2c_xfer,
> - .master_xfer_atomic = rk3x_i2c_xfer_polling,
> + .xfer = rk3x_i2c_xfer,
> + .xfer_atomic = rk3x_i2c_xfer_polling,
> .functionality = rk3x_i2c_func,
> };
>
>