Commit d9192987 authored by Wolfram Sang's avatar Wolfram Sang Committed by Andi Shyti
Browse files

i2c: viai2c: 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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent f2005ced

drivers/i2c/busses/i2c-viai2c-common.c

+1 −1
Original line number Diff line number Diff line
@@ -198,6 +198,6 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c, int plat) 
}

EXPORT_SYMBOL_GPL(viai2c_init);



MODULE_DESCRIPTION("Via/Wondermedia/Zhaoxin I2C master-mode bus adapter");

MODULE_DESCRIPTION("Via/Wondermedia/Zhaoxin I2C controller core");

MODULE_AUTHOR("Tony Prisk <linux@prisktech.co.nz>");

MODULE_LICENSE("GPL");

drivers/i2c/busses/i2c-viai2c-wmt.c

+4 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 *  Wondermedia I2C Master Mode Driver

 *  Wondermedia I2C Controller Driver

 *

 *  Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>

 *
@@ -35,7 +35,7 @@ static u32 wmt_i2c_func(struct i2c_adapter *adap) 
}



static const struct i2c_algorithm wmt_i2c_algo = {

	.master_xfer	= viai2c_xfer,

	.xfer = viai2c_xfer,

	.functionality = wmt_i2c_func,

};
@@ -178,7 +178,7 @@ static struct platform_driver wmt_i2c_driver = { 


module_platform_driver(wmt_i2c_driver);



MODULE_DESCRIPTION("Wondermedia I2C master-mode bus adapter");

MODULE_DESCRIPTION("Wondermedia I2C controller driver");

MODULE_AUTHOR("Tony Prisk <linux@prisktech.co.nz>");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(of, wmt_i2c_dt_ids);

drivers/i2c/busses/i2c-viai2c-zhaoxin.c

+6 −6
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define ZXI2C_GOLD_FSTP_400K	0x38

#define ZXI2C_GOLD_FSTP_1M	0x13

#define ZXI2C_GOLD_FSTP_3400K	0x37

#define ZXI2C_HS_MASTER_CODE	(0x08 << 8)

#define ZXI2C_HS_CTRL_CODE	(0x08 << 8)



#define ZXI2C_FIFO_SIZE		32
@@ -136,7 +136,7 @@ static int viai2c_fifo_irq_xfer(struct viai2c *i2c) 
	return 0;

}



static int zxi2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)

static int zxi2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)

{

	u8 tmp;

	int ret;
@@ -194,7 +194,7 @@ static u32 zxi2c_func(struct i2c_adapter *adap) 
}



static const struct i2c_algorithm zxi2c_algorithm = {

	.master_xfer	= zxi2c_master_xfer,

	.xfer = zxi2c_xfer,

	.functionality = zxi2c_func,

};
@@ -250,9 +250,9 @@ static void zxi2c_get_bus_speed(struct viai2c *i2c) 


	i2c->tcr = params[1];

	priv->mcr = ioread16(i2c->base + VIAI2C_REG_MCR);

	/* for Hs-mode, use 0x80 as master code */

	/* for Hs-mode, use 0x80 as controller code */

	if (params[0] == I2C_MAX_HIGH_SPEED_MODE_FREQ)

		priv->mcr |= ZXI2C_HS_MASTER_CODE;

		priv->mcr |= ZXI2C_HS_CTRL_CODE;



	dev_info(i2c->dev, "speed mode is %s\n", i2c_freq_mode_string(params[0]));

}