kevin/linux
1
Fork 0
Code

i2c: bcm-kona: 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.
Remove a useless comment while here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
This commit is contained in:
Wolfram Sang 2024-07-06 13:20:05 +02:00 committed by Andi Shyti
parent a4c98e4ada
commit 045f96ed93
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/i2c/busses/i2c-bcm-kona.c
View File

@ -85,7 +85,7 @@
#define STD_EXT_CLK_FREQ 13000000UL #define STD_EXT_CLK_FREQ 13000000UL
#define HS_EXT_CLK_FREQ 104000000UL #define HS_EXT_CLK_FREQ 104000000UL
#define MASTERCODE 0x08 /* Mastercodes are 0000_1xxxb */ #define CONTROLLER_CODE 0x08 /* Controller codes are 0000_1xxxb */
#define I2C_TIMEOUT 100 /* msecs */ #define I2C_TIMEOUT 100 /* msecs */
@ -544,8 +544,8 @@ static int bcm_kona_i2c_switch_to_hs(struct bcm_kona_i2c_dev *dev)
{ {
int rc; int rc;
/* Send mastercode at standard speed */ /* Send controller code at standard speed */
rc = bcm_kona_i2c_write_byte(dev, MASTERCODE, 1); rc = bcm_kona_i2c_write_byte(dev, CONTROLLER_CODE, 1);
if (rc < 0) { if (rc < 0) {
pr_err("High speed handshake failed\n"); pr_err("High speed handshake failed\n");
return rc; return rc;
@ -587,7 +587,6 @@ static int bcm_kona_i2c_switch_to_std(struct bcm_kona_i2c_dev *dev)
return rc; return rc;
} }
/* Master transfer function */
static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter, static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter,
struct i2c_msg msgs[], int num) struct i2c_msg msgs[], int num)
{ {
@ -637,7 +636,7 @@ static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter,
} }
} }
/* Send slave address */ /* Send target address */
if (!(pmsg->flags & I2C_M_NOSTART)) { if (!(pmsg->flags & I2C_M_NOSTART)) {
rc = bcm_kona_i2c_do_addr(dev, pmsg); rc = bcm_kona_i2c_do_addr(dev, pmsg);
if (rc < 0) { if (rc < 0) {
@ -697,7 +696,7 @@ static uint32_t bcm_kona_i2c_functionality(struct i2c_adapter *adap)
} }
static const struct i2c_algorithm bcm_algo = { static const struct i2c_algorithm bcm_algo = {
.master_xfer = bcm_kona_i2c_xfer, .xfer = bcm_kona_i2c_xfer,
.functionality = bcm_kona_i2c_functionality, .functionality = bcm_kona_i2c_functionality,
}; };
@ -722,7 +721,7 @@ static int bcm_kona_i2c_assign_bus_speed(struct bcm_kona_i2c_dev *dev)
dev->std_cfg = &std_cfg_table[BCM_SPD_1MHZ]; dev->std_cfg = &std_cfg_table[BCM_SPD_1MHZ];
break; break;
case I2C_MAX_HIGH_SPEED_MODE_FREQ: case I2C_MAX_HIGH_SPEED_MODE_FREQ:
/* Send mastercode at 100k */ /* Send controller code at 100k */
dev->std_cfg = &std_cfg_table[BCM_SPD_100K]; dev->std_cfg = &std_cfg_table[BCM_SPD_100K];
dev->hs_cfg = &hs_cfg_table[BCM_SPD_3P4MHZ]; dev->hs_cfg = &hs_cfg_table[BCM_SPD_3P4MHZ];
break; break;