| Message ID | 20240430173812.1423757-13-eahariha@linux.microsoft.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Make I2C terminology more inclusive for I2C Algobit and consumers | expand |
Am 30.04.24 um 19:38 schrieb Easwar Hariharan: > I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" > with more appropriate terms. Inspired by and following on to Wolfram's > series to fix drivers/i2c/[1], fix the terminology for users of > I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists > in the specification. > > Compile tested, no functionality changes intended > > [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ > > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/video/fbdev/via/chip.h | 8 ++++---- > drivers/video/fbdev/via/dvi.c | 24 ++++++++++++------------ > drivers/video/fbdev/via/lcd.c | 6 +++--- > drivers/video/fbdev/via/via_aux.h | 2 +- > drivers/video/fbdev/via/via_i2c.c | 12 ++++++------ > drivers/video/fbdev/via/vt1636.c | 6 +++--- > 6 files changed, 29 insertions(+), 29 deletions(-) > > diff --git a/drivers/video/fbdev/via/chip.h b/drivers/video/fbdev/via/chip.h > index f0a19cbcb9e5..1ea6d4ce79e7 100644 > --- a/drivers/video/fbdev/via/chip.h > +++ b/drivers/video/fbdev/via/chip.h > @@ -69,7 +69,7 @@ > #define VT1632_TMDS 0x01 > #define INTEGRATED_TMDS 0x42 > > -/* Definition TMDS Trasmitter I2C Slave Address */ > +/* Definition TMDS Trasmitter I2C Client Address */ > #define VT1632_TMDS_I2C_ADDR 0x10 > > /**************************************************/ > @@ -88,21 +88,21 @@ > #define TX_DATA_DDR_MODE 0x04 > #define TX_DATA_SDR_MODE 0x08 > > -/* Definition LVDS Trasmitter I2C Slave Address */ > +/* Definition LVDS Trasmitter I2C Client Address */ > #define VT1631_LVDS_I2C_ADDR 0x70 > #define VT3271_LVDS_I2C_ADDR 0x80 > #define VT1636_LVDS_I2C_ADDR 0x80 > > struct tmds_chip_information { > int tmds_chip_name; > - int tmds_chip_slave_addr; > + int tmds_chip_client_addr; > int output_interface; > int i2c_port; > }; > > struct lvds_chip_information { > int lvds_chip_name; > - int lvds_chip_slave_addr; > + int lvds_chip_client_addr; > int output_interface; > int i2c_port; > }; > diff --git a/drivers/video/fbdev/via/dvi.c b/drivers/video/fbdev/via/dvi.c > index 13147e3066eb..db7db26416c3 100644 > --- a/drivers/video/fbdev/via/dvi.c > +++ b/drivers/video/fbdev/via/dvi.c > @@ -70,7 +70,7 @@ bool viafb_tmds_trasmitter_identify(void) > /* Check for VT1632: */ > viaparinfo->chip_info->tmds_chip_info.tmds_chip_name = VT1632_TMDS; > viaparinfo->chip_info-> > - tmds_chip_info.tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR; > + tmds_chip_info.tmds_chip_client_addr = VT1632_TMDS_I2C_ADDR; > viaparinfo->chip_info->tmds_chip_info.i2c_port = VIA_PORT_31; > if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID)) { > /* > @@ -128,14 +128,14 @@ bool viafb_tmds_trasmitter_identify(void) > viaparinfo->chip_info-> > tmds_chip_info.tmds_chip_name = NON_TMDS_TRANSMITTER; > viaparinfo->chip_info->tmds_chip_info. > - tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR; > + tmds_chip_client_addr = VT1632_TMDS_I2C_ADDR; > return false; > } > > static void tmds_register_write(int index, u8 data) > { > viafb_i2c_writebyte(viaparinfo->chip_info->tmds_chip_info.i2c_port, > - viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr, > + viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr, > index, data); > } > > @@ -144,7 +144,7 @@ static int tmds_register_read(int index) > u8 data; > > viafb_i2c_readbyte(viaparinfo->chip_info->tmds_chip_info.i2c_port, > - (u8) viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr, > + (u8) viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr, > (u8) index, &data); > return data; > } > @@ -152,7 +152,7 @@ static int tmds_register_read(int index) > static int tmds_register_read_bytes(int index, u8 *buff, int buff_len) > { > viafb_i2c_readbytes(viaparinfo->chip_info->tmds_chip_info.i2c_port, > - (u8) viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr, > + (u8) viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr, > (u8) index, buff, buff_len); > return 0; > } > @@ -256,14 +256,14 @@ static int viafb_dvi_query_EDID(void) > > DEBUG_MSG(KERN_INFO "viafb_dvi_query_EDID!!\n"); > > - restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr; > - viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA0; > + restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr; > + viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr = 0xA0; > > data0 = (u8) tmds_register_read(0x00); > data1 = (u8) tmds_register_read(0x01); > if ((data0 == 0) && (data1 == 0xFF)) { > viaparinfo->chip_info-> > - tmds_chip_info.tmds_chip_slave_addr = restore; > + tmds_chip_info.tmds_chip_client_addr = restore; > return EDID_VERSION_1; /* Found EDID1 Table */ > } > > @@ -280,8 +280,8 @@ static void dvi_get_panel_size_from_DDCv1( > > DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv1 \n"); > > - restore = tmds_chip->tmds_chip_slave_addr; > - tmds_chip->tmds_chip_slave_addr = 0xA0; > + restore = tmds_chip->tmds_chip_client_addr; > + tmds_chip->tmds_chip_client_addr = 0xA0; > for (i = 0x25; i < 0x6D; i++) { > switch (i) { > case 0x36: > @@ -306,7 +306,7 @@ static void dvi_get_panel_size_from_DDCv1( > > DEBUG_MSG(KERN_INFO "DVI max pixelclock = %d\n", > tmds_setting->max_pixel_clock); > - tmds_chip->tmds_chip_slave_addr = restore; > + tmds_chip->tmds_chip_client_addr = restore; > } > > /* If Disable DVI, turn off pad */ > @@ -427,7 +427,7 @@ void viafb_dvi_enable(void) > viafb_i2c_writebyte(viaparinfo->chip_info-> > tmds_chip_info.i2c_port, > viaparinfo->chip_info-> > - tmds_chip_info.tmds_chip_slave_addr, > + tmds_chip_info.tmds_chip_client_addr, > 0x08, data); > } > } > diff --git a/drivers/video/fbdev/via/lcd.c b/drivers/video/fbdev/via/lcd.c > index beec5c8d4d08..9a6e4ac9e551 100644 > --- a/drivers/video/fbdev/via/lcd.c > +++ b/drivers/video/fbdev/via/lcd.c > @@ -147,7 +147,7 @@ bool viafb_lvds_trasmitter_identify(void) > return true; > /* Check for VT1631: */ > viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = VT1631_LVDS; > - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = > + viaparinfo->chip_info->lvds_chip_info.lvds_chip_client_addr = > VT1631_LVDS_I2C_ADDR; > > if (check_lvds_chip(VT1631_DEVICE_ID_REG, VT1631_DEVICE_ID)) { > @@ -161,7 +161,7 @@ bool viafb_lvds_trasmitter_identify(void) > > viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = > NON_LVDS_TRANSMITTER; > - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = > + viaparinfo->chip_info->lvds_chip_info.lvds_chip_client_addr = > VT1631_LVDS_I2C_ADDR; > return false; > } > @@ -327,7 +327,7 @@ static int lvds_register_read(int index) > u8 data; > > viafb_i2c_readbyte(VIA_PORT_2C, > - (u8) viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr, > + (u8) viaparinfo->chip_info->lvds_chip_info.lvds_chip_client_addr, > (u8) index, &data); > return data; > } > diff --git a/drivers/video/fbdev/via/via_aux.h b/drivers/video/fbdev/via/via_aux.h > index 0933bbf20e58..e2b617b1e6fd 100644 > --- a/drivers/video/fbdev/via/via_aux.h > +++ b/drivers/video/fbdev/via/via_aux.h > @@ -24,7 +24,7 @@ struct via_aux_drv { > struct list_head chain; /* chain to support multiple drivers */ > > struct via_aux_bus *bus; /* the I2C bus used */ > - u8 addr; /* the I2C slave address */ > + u8 addr; /* the I2C client address */ > > const char *name; /* human readable name of the driver */ > void *data; /* private data of this driver */ > diff --git a/drivers/video/fbdev/via/via_i2c.c b/drivers/video/fbdev/via/via_i2c.c > index 582502810575..907c739475d0 100644 > --- a/drivers/video/fbdev/via/via_i2c.c > +++ b/drivers/video/fbdev/via/via_i2c.c > @@ -104,7 +104,7 @@ static void via_i2c_setsda(void *data, int state) > spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags); > } > > -int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata) > +int viafb_i2c_readbyte(u8 adap, u8 client_addr, u8 index, u8 *pdata) > { > int ret; > u8 mm1[] = {0x00}; > @@ -115,7 +115,7 @@ int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata) > *pdata = 0; > msgs[0].flags = 0; > msgs[1].flags = I2C_M_RD; > - msgs[0].addr = msgs[1].addr = slave_addr / 2; > + msgs[0].addr = msgs[1].addr = client_addr / 2; > mm1[0] = index; > msgs[0].len = 1; msgs[1].len = 1; > msgs[0].buf = mm1; msgs[1].buf = pdata; > @@ -128,7 +128,7 @@ int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata) > return ret; > } > > -int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data) > +int viafb_i2c_writebyte(u8 adap, u8 client_addr, u8 index, u8 data) > { > int ret; > u8 msg[2] = { index, data }; > @@ -137,7 +137,7 @@ int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data) > if (!via_i2c_par[adap].is_active) > return -ENODEV; > msgs.flags = 0; > - msgs.addr = slave_addr / 2; > + msgs.addr = client_addr / 2; > msgs.len = 2; > msgs.buf = msg; > ret = i2c_transfer(&via_i2c_par[adap].adapter, &msgs, 1); > @@ -149,7 +149,7 @@ int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data) > return ret; > } > > -int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len) > +int viafb_i2c_readbytes(u8 adap, u8 client_addr, u8 index, u8 *buff, int buff_len) > { > int ret; > u8 mm1[] = {0x00}; > @@ -159,7 +159,7 @@ int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len > return -ENODEV; > msgs[0].flags = 0; > msgs[1].flags = I2C_M_RD; > - msgs[0].addr = msgs[1].addr = slave_addr / 2; > + msgs[0].addr = msgs[1].addr = client_addr / 2; > mm1[0] = index; > msgs[0].len = 1; msgs[1].len = buff_len; > msgs[0].buf = mm1; msgs[1].buf = buff; > diff --git a/drivers/video/fbdev/via/vt1636.c b/drivers/video/fbdev/via/vt1636.c > index 8d8cfdb05618..614e5c29a449 100644 > --- a/drivers/video/fbdev/via/vt1636.c > +++ b/drivers/video/fbdev/via/vt1636.c > @@ -44,7 +44,7 @@ u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information > u8 data; > > viafb_i2c_readbyte(plvds_chip_info->i2c_port, > - plvds_chip_info->lvds_chip_slave_addr, index, &data); > + plvds_chip_info->lvds_chip_client_addr, index, &data); > return data; > } > > @@ -60,7 +60,7 @@ void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information > data = (data & (~io_data.Mask)) | io_data.Data; > > viafb_i2c_writebyte(plvds_chip_info->i2c_port, > - plvds_chip_info->lvds_chip_slave_addr, index, data); > + plvds_chip_info->lvds_chip_client_addr, index, data); > } > > void viafb_init_lvds_vt1636(struct lvds_setting_information > @@ -113,7 +113,7 @@ bool viafb_lvds_identify_vt1636(u8 i2c_adapter) > DEBUG_MSG(KERN_INFO "viafb_lvds_identify_vt1636.\n"); > > /* Sense VT1636 LVDS Transmiter */ > - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = > + viaparinfo->chip_info->lvds_chip_info.lvds_chip_client_addr = > VT1636_LVDS_I2C_ADDR; > > /* Check vendor ID first: */
On 5/2/2024 3:46 AM, Thomas Zimmermann wrote: > > > Am 30.04.24 um 19:38 schrieb Easwar Hariharan: >> I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" >> with more appropriate terms. Inspired by and following on to Wolfram's >> series to fix drivers/i2c/[1], fix the terminology for users of >> I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists >> in the specification. >> >> Compile tested, no functionality changes intended >> >> [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ >> >> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > > Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > Thanks for the ack! I had been addressing feedback as I got it on the v0 series, and it seems I missed out on updating viafb and smscufx to spec-compliant controller/target terminology like the v0->v1 changelog calls out before posting v1. For smscufx, I feel phrasing the following line (as an example) > -/* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, host, > +/* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, *controller*, would actually impact readability negatively, so I propose to leave smscufx as is. For viafb, I propose making it compliant with the spec using the controller/target terminology and posting a v2 respin (which I can send out as soon as you say) and ask you to review again. What do you think? Thanks, Easwar >> --- >> drivers/video/fbdev/via/chip.h | 8 ++++---- >> drivers/video/fbdev/via/dvi.c | 24 ++++++++++++------------ >> drivers/video/fbdev/via/lcd.c | 6 +++--- >> drivers/video/fbdev/via/via_aux.h | 2 +- >> drivers/video/fbdev/via/via_i2c.c | 12 ++++++------ >> drivers/video/fbdev/via/vt1636.c | 6 +++--- >> 6 files changed, 29 insertions(+), 29 deletions(-) >> <snip>
Hi Am 03.05.24 um 00:26 schrieb Easwar Hariharan: > On 5/2/2024 3:46 AM, Thomas Zimmermann wrote: >> >> Am 30.04.24 um 19:38 schrieb Easwar Hariharan: >>> I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" >>> with more appropriate terms. Inspired by and following on to Wolfram's >>> series to fix drivers/i2c/[1], fix the terminology for users of >>> I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists >>> in the specification. >>> >>> Compile tested, no functionality changes intended >>> >>> [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ >>> >>> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> >> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> >> > Thanks for the ack! I had been addressing feedback as I got it on the v0 series, and it seems > I missed out on updating viafb and smscufx to spec-compliant controller/target terminology like > the v0->v1 changelog calls out before posting v1. > > For smscufx, I feel phrasing the following line (as an example) > >> -/* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, host, >> +/* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, *controller*, > would actually impact readability negatively, so I propose to leave smscufx as is. Why? I don't see much of a difference. > > For viafb, I propose making it compliant with the spec using the controller/target terminology and > posting a v2 respin (which I can send out as soon as you say) and ask you to review again. > > What do you think? I think we should adopt the spec's language everywhere. That makes it possible to grep the spec for terms used in the source code. Using 'host' in smscufx appears to introduce yet another term. If you are worried about using 'I2C controller' and 'controller' in the same sentence, you can replace 'I2C controller' with 'DDC channel'. That's even more precise about the purpose of this code. Best regards Thomas > > Thanks, > Easwar > >>> --- >>> drivers/video/fbdev/via/chip.h | 8 ++++---- >>> drivers/video/fbdev/via/dvi.c | 24 ++++++++++++------------ >>> drivers/video/fbdev/via/lcd.c | 6 +++--- >>> drivers/video/fbdev/via/via_aux.h | 2 +- >>> drivers/video/fbdev/via/via_i2c.c | 12 ++++++------ >>> drivers/video/fbdev/via/vt1636.c | 6 +++--- >>> 6 files changed, 29 insertions(+), 29 deletions(-) >>> > <snip> >
On 5/3/2024 12:39 AM, Thomas Zimmermann wrote: > Hi > > Am 03.05.24 um 00:26 schrieb Easwar Hariharan: >> On 5/2/2024 3:46 AM, Thomas Zimmermann wrote: >>> >>> Am 30.04.24 um 19:38 schrieb Easwar Hariharan: >>>> I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" >>>> with more appropriate terms. Inspired by and following on to Wolfram's >>>> series to fix drivers/i2c/[1], fix the terminology for users of >>>> I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists >>>> in the specification. >>>> >>>> Compile tested, no functionality changes intended >>>> >>>> [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ >>>> >>>> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> >>> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> >>> >> Thanks for the ack! I had been addressing feedback as I got it on the v0 series, and it seems >> I missed out on updating viafb and smscufx to spec-compliant controller/target terminology like >> the v0->v1 changelog calls out before posting v1. >> >> For smscufx, I feel phrasing the following line (as an example) >> >>> -/* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, host, >>> +/* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, *controller*, >> would actually impact readability negatively, so I propose to leave smscufx as is. > > Why? I don't see much of a difference. > >> >> For viafb, I propose making it compliant with the spec using the controller/target terminology and >> posting a v2 respin (which I can send out as soon as you say) and ask you to review again. >> >> What do you think? > > I think we should adopt the spec's language everywhere. That makes it possible to grep the spec for terms used in the source code. Using 'host' in smscufx appears to introduce yet another term. If you are worried about using 'I2C controller' and 'controller' in the same sentence, you can replace 'I2C controller' with 'DDC channel'. That's even more precise about the purpose of this code. Great, thanks! That was exactly my concern, I will fix up smscufx and send a v2. Thanks, Easwar
diff --git a/drivers/video/fbdev/via/chip.h b/drivers/video/fbdev/via/chip.h index f0a19cbcb9e5..1ea6d4ce79e7 100644 --- a/drivers/video/fbdev/via/chip.h +++ b/drivers/video/fbdev/via/chip.h @@ -69,7 +69,7 @@ #define VT1632_TMDS 0x01 #define INTEGRATED_TMDS 0x42 -/* Definition TMDS Trasmitter I2C Slave Address */ +/* Definition TMDS Trasmitter I2C Client Address */ #define VT1632_TMDS_I2C_ADDR 0x10 /**************************************************/ @@ -88,21 +88,21 @@ #define TX_DATA_DDR_MODE 0x04 #define TX_DATA_SDR_MODE 0x08 -/* Definition LVDS Trasmitter I2C Slave Address */ +/* Definition LVDS Trasmitter I2C Client Address */ #define VT1631_LVDS_I2C_ADDR 0x70 #define VT3271_LVDS_I2C_ADDR 0x80 #define VT1636_LVDS_I2C_ADDR 0x80 struct tmds_chip_information { int tmds_chip_name; - int tmds_chip_slave_addr; + int tmds_chip_client_addr; int output_interface; int i2c_port; }; struct lvds_chip_information { int lvds_chip_name; - int lvds_chip_slave_addr; + int lvds_chip_client_addr; int output_interface; int i2c_port; }; diff --git a/drivers/video/fbdev/via/dvi.c b/drivers/video/fbdev/via/dvi.c index 13147e3066eb..db7db26416c3 100644 --- a/drivers/video/fbdev/via/dvi.c +++ b/drivers/video/fbdev/via/dvi.c @@ -70,7 +70,7 @@ bool viafb_tmds_trasmitter_identify(void) /* Check for VT1632: */ viaparinfo->chip_info->tmds_chip_info.tmds_chip_name = VT1632_TMDS; viaparinfo->chip_info-> - tmds_chip_info.tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR; + tmds_chip_info.tmds_chip_client_addr = VT1632_TMDS_I2C_ADDR; viaparinfo->chip_info->tmds_chip_info.i2c_port = VIA_PORT_31; if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID)) { /* @@ -128,14 +128,14 @@ bool viafb_tmds_trasmitter_identify(void) viaparinfo->chip_info-> tmds_chip_info.tmds_chip_name = NON_TMDS_TRANSMITTER; viaparinfo->chip_info->tmds_chip_info. - tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR; + tmds_chip_client_addr = VT1632_TMDS_I2C_ADDR; return false; } static void tmds_register_write(int index, u8 data) { viafb_i2c_writebyte(viaparinfo->chip_info->tmds_chip_info.i2c_port, - viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr, + viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr, index, data); } @@ -144,7 +144,7 @@ static int tmds_register_read(int index) u8 data; viafb_i2c_readbyte(viaparinfo->chip_info->tmds_chip_info.i2c_port, - (u8) viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr, + (u8) viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr, (u8) index, &data); return data; } @@ -152,7 +152,7 @@ static int tmds_register_read(int index) static int tmds_register_read_bytes(int index, u8 *buff, int buff_len) { viafb_i2c_readbytes(viaparinfo->chip_info->tmds_chip_info.i2c_port, - (u8) viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr, + (u8) viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr, (u8) index, buff, buff_len); return 0; } @@ -256,14 +256,14 @@ static int viafb_dvi_query_EDID(void) DEBUG_MSG(KERN_INFO "viafb_dvi_query_EDID!!\n"); - restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr; - viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA0; + restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr; + viaparinfo->chip_info->tmds_chip_info.tmds_chip_client_addr = 0xA0; data0 = (u8) tmds_register_read(0x00); data1 = (u8) tmds_register_read(0x01); if ((data0 == 0) && (data1 == 0xFF)) { viaparinfo->chip_info-> - tmds_chip_info.tmds_chip_slave_addr = restore; + tmds_chip_info.tmds_chip_client_addr = restore; return EDID_VERSION_1; /* Found EDID1 Table */ } @@ -280,8 +280,8 @@ static void dvi_get_panel_size_from_DDCv1( DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv1 \n"); - restore = tmds_chip->tmds_chip_slave_addr; - tmds_chip->tmds_chip_slave_addr = 0xA0; + restore = tmds_chip->tmds_chip_client_addr; + tmds_chip->tmds_chip_client_addr = 0xA0; for (i = 0x25; i < 0x6D; i++) { switch (i) { case 0x36: @@ -306,7 +306,7 @@ static void dvi_get_panel_size_from_DDCv1( DEBUG_MSG(KERN_INFO "DVI max pixelclock = %d\n", tmds_setting->max_pixel_clock); - tmds_chip->tmds_chip_slave_addr = restore; + tmds_chip->tmds_chip_client_addr = restore; } /* If Disable DVI, turn off pad */ @@ -427,7 +427,7 @@ void viafb_dvi_enable(void) viafb_i2c_writebyte(viaparinfo->chip_info-> tmds_chip_info.i2c_port, viaparinfo->chip_info-> - tmds_chip_info.tmds_chip_slave_addr, + tmds_chip_info.tmds_chip_client_addr, 0x08, data); } } diff --git a/drivers/video/fbdev/via/lcd.c b/drivers/video/fbdev/via/lcd.c index beec5c8d4d08..9a6e4ac9e551 100644 --- a/drivers/video/fbdev/via/lcd.c +++ b/drivers/video/fbdev/via/lcd.c @@ -147,7 +147,7 @@ bool viafb_lvds_trasmitter_identify(void) return true; /* Check for VT1631: */ viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = VT1631_LVDS; - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = + viaparinfo->chip_info->lvds_chip_info.lvds_chip_client_addr = VT1631_LVDS_I2C_ADDR; if (check_lvds_chip(VT1631_DEVICE_ID_REG, VT1631_DEVICE_ID)) { @@ -161,7 +161,7 @@ bool viafb_lvds_trasmitter_identify(void) viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = NON_LVDS_TRANSMITTER; - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = + viaparinfo->chip_info->lvds_chip_info.lvds_chip_client_addr = VT1631_LVDS_I2C_ADDR; return false; } @@ -327,7 +327,7 @@ static int lvds_register_read(int index) u8 data; viafb_i2c_readbyte(VIA_PORT_2C, - (u8) viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr, + (u8) viaparinfo->chip_info->lvds_chip_info.lvds_chip_client_addr, (u8) index, &data); return data; } diff --git a/drivers/video/fbdev/via/via_aux.h b/drivers/video/fbdev/via/via_aux.h index 0933bbf20e58..e2b617b1e6fd 100644 --- a/drivers/video/fbdev/via/via_aux.h +++ b/drivers/video/fbdev/via/via_aux.h @@ -24,7 +24,7 @@ struct via_aux_drv { struct list_head chain; /* chain to support multiple drivers */ struct via_aux_bus *bus; /* the I2C bus used */ - u8 addr; /* the I2C slave address */ + u8 addr; /* the I2C client address */ const char *name; /* human readable name of the driver */ void *data; /* private data of this driver */ diff --git a/drivers/video/fbdev/via/via_i2c.c b/drivers/video/fbdev/via/via_i2c.c index 582502810575..907c739475d0 100644 --- a/drivers/video/fbdev/via/via_i2c.c +++ b/drivers/video/fbdev/via/via_i2c.c @@ -104,7 +104,7 @@ static void via_i2c_setsda(void *data, int state) spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags); } -int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata) +int viafb_i2c_readbyte(u8 adap, u8 client_addr, u8 index, u8 *pdata) { int ret; u8 mm1[] = {0x00}; @@ -115,7 +115,7 @@ int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata) *pdata = 0; msgs[0].flags = 0; msgs[1].flags = I2C_M_RD; - msgs[0].addr = msgs[1].addr = slave_addr / 2; + msgs[0].addr = msgs[1].addr = client_addr / 2; mm1[0] = index; msgs[0].len = 1; msgs[1].len = 1; msgs[0].buf = mm1; msgs[1].buf = pdata; @@ -128,7 +128,7 @@ int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata) return ret; } -int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data) +int viafb_i2c_writebyte(u8 adap, u8 client_addr, u8 index, u8 data) { int ret; u8 msg[2] = { index, data }; @@ -137,7 +137,7 @@ int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data) if (!via_i2c_par[adap].is_active) return -ENODEV; msgs.flags = 0; - msgs.addr = slave_addr / 2; + msgs.addr = client_addr / 2; msgs.len = 2; msgs.buf = msg; ret = i2c_transfer(&via_i2c_par[adap].adapter, &msgs, 1); @@ -149,7 +149,7 @@ int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data) return ret; } -int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len) +int viafb_i2c_readbytes(u8 adap, u8 client_addr, u8 index, u8 *buff, int buff_len) { int ret; u8 mm1[] = {0x00}; @@ -159,7 +159,7 @@ int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len return -ENODEV; msgs[0].flags = 0; msgs[1].flags = I2C_M_RD; - msgs[0].addr = msgs[1].addr = slave_addr / 2; + msgs[0].addr = msgs[1].addr = client_addr / 2; mm1[0] = index; msgs[0].len = 1; msgs[1].len = buff_len; msgs[0].buf = mm1; msgs[1].buf = buff; diff --git a/drivers/video/fbdev/via/vt1636.c b/drivers/video/fbdev/via/vt1636.c index 8d8cfdb05618..614e5c29a449 100644 --- a/drivers/video/fbdev/via/vt1636.c +++ b/drivers/video/fbdev/via/vt1636.c @@ -44,7 +44,7 @@ u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information u8 data; viafb_i2c_readbyte(plvds_chip_info->i2c_port, - plvds_chip_info->lvds_chip_slave_addr, index, &data); + plvds_chip_info->lvds_chip_client_addr, index, &data); return data; } @@ -60,7 +60,7 @@ void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information data = (data & (~io_data.Mask)) | io_data.Data; viafb_i2c_writebyte(plvds_chip_info->i2c_port, - plvds_chip_info->lvds_chip_slave_addr, index, data); + plvds_chip_info->lvds_chip_client_addr, index, data); } void viafb_init_lvds_vt1636(struct lvds_setting_information @@ -113,7 +113,7 @@ bool viafb_lvds_identify_vt1636(u8 i2c_adapter) DEBUG_MSG(KERN_INFO "viafb_lvds_identify_vt1636.\n"); /* Sense VT1636 LVDS Transmiter */ - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = + viaparinfo->chip_info->lvds_chip_info.lvds_chip_client_addr = VT1636_LVDS_I2C_ADDR; /* Check vendor ID first: */
I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" with more appropriate terms. Inspired by and following on to Wolfram's series to fix drivers/i2c/[1], fix the terminology for users of I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists in the specification. Compile tested, no functionality changes intended [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> --- drivers/video/fbdev/via/chip.h | 8 ++++---- drivers/video/fbdev/via/dvi.c | 24 ++++++++++++------------ drivers/video/fbdev/via/lcd.c | 6 +++--- drivers/video/fbdev/via/via_aux.h | 2 +- drivers/video/fbdev/via/via_i2c.c | 12 ++++++------ drivers/video/fbdev/via/vt1636.c | 6 +++--- 6 files changed, 29 insertions(+), 29 deletions(-)