From nobody Wed Dec 17 20:59:18 2025 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D684915AAB3; Fri, 3 May 2024 18:15:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714760138; cv=none; b=MrKJTH/hsWYbzqaL1rTVF7E6L0uEpCpzouNSjxFz42w+FmoXPsJgLvXkruOAYnAMtZ4mgu+PLCWQBSMxP9QFnPLOvirbLHJc/+fz1L2Z8glT7ggM7jLH6w3sQz1H01f1x/vTQMHv8AHBb6iUS3x8JG/uMzjVThcoCZh8vX1TJXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714760138; c=relaxed/simple; bh=tlNFGiFujHwjXMy3RbrYFmC4p8ErqAtl8ajlrNcFFlM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QWvPcMdfp2FG+Hr5Z8UuaO8mv6ewsIwUq32AFstA3szOQksWr00FgbcaJPXxd7+fDoHdK1jFceBp5xrRB+udRsjpPF22tearRbMpFww//E2x/VqUaqtyyGDZqXuKZqD3XRtGENNM7uJB+zpXXa/Rh/1JXjUXYsY7YLhvpWCo7NM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=s2FdwZtF; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="s2FdwZtF" Received: from rrs24-12-35.corp.microsoft.com (unknown [131.107.8.16]) by linux.microsoft.com (Postfix) with ESMTPSA id 71B1220B2C84; Fri, 3 May 2024 11:15:36 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 71B1220B2C84 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1714760136; bh=wQSE2egvkK9lgXRooBoCiTH/scNNeZUHY84ZEhHBSh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s2FdwZtFPFIFJYiQT8FtzYrInio/RmswiPRnKfp5APl5eojQ9CxJvUUcyI0979HDP X6njF9BOfUcEnZoa/EBcRRu5t29JN2rd++Mobzf3JOZ8qLFvsdMwoQ7aeBzUb6koeg +9K9AxkeSxAlPuYnlgZjO8AMn4EoMsm2f5IkQbUg= From: Easwar Hariharan To: Florian Tobias Schandinat , Helge Deller , linux-fbdev@vger.kernel.org (open list:VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER), dri-devel@lists.freedesktop.org (open list:FRAMEBUFFER LAYER), linux-kernel@vger.kernel.org (open list) Cc: Wolfram Sang , amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list), intel-gfx@lists.freedesktop.org (open list:INTEL DRM DISPLAY FOR XE AND I915 DRIVERS), intel-xe@lists.freedesktop.org (open list:INTEL DRM DISPLAY FOR XE AND I915 DRIVERS), nouveau@lists.freedesktop.org (open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS), linux-i2c@vger.kernel.org (open list:I2C SUBSYSTEM HOST DRIVERS), linux-media@vger.kernel.org (open list:BTTV VIDEO4LINUX DRIVER), linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER), Easwar Hariharan Subject: [PATCH v2 12/12] fbdev/viafb: Make I2C terminology more inclusive Date: Fri, 3 May 2024 18:13:33 +0000 Message-Id: <20240503181333.2336999-13-eahariha@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240503181333.2336999-1-eahariha@linux.microsoft.com> References: <20240503181333.2336999-1-eahariha@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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-eng= ineering.com/ Signed-off-by: Easwar Hariharan Acked-by: Thomas Zimmermann --- 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..f81af13630e2 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 =20 -/* Definition TMDS Trasmitter I2C Slave Address */ +/* Definition TMDS Trasmitter I2C Target Address */ #define VT1632_TMDS_I2C_ADDR 0x10 =20 /**************************************************/ @@ -88,21 +88,21 @@ #define TX_DATA_DDR_MODE 0x04 #define TX_DATA_SDR_MODE 0x08 =20 -/* Definition LVDS Trasmitter I2C Slave Address */ +/* Definition LVDS Trasmitter I2C Target Address */ #define VT1631_LVDS_I2C_ADDR 0x70 #define VT3271_LVDS_I2C_ADDR 0x80 #define VT1636_LVDS_I2C_ADDR 0x80 =20 struct tmds_chip_information { int tmds_chip_name; - int tmds_chip_slave_addr; + int tmds_chip_target_addr; int output_interface; int i2c_port; }; =20 struct lvds_chip_information { int lvds_chip_name; - int lvds_chip_slave_addr; + int lvds_chip_target_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..27990a73bfa3 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 =3D VT1632_TMDS; viaparinfo->chip_info-> - tmds_chip_info.tmds_chip_slave_addr =3D VT1632_TMDS_I2C_ADDR; + tmds_chip_info.tmds_chip_target_addr =3D VT1632_TMDS_I2C_ADDR; viaparinfo->chip_info->tmds_chip_info.i2c_port =3D 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 =3D NON_TMDS_TRANSMITTER; viaparinfo->chip_info->tmds_chip_info. - tmds_chip_slave_addr =3D VT1632_TMDS_I2C_ADDR; + tmds_chip_target_addr =3D VT1632_TMDS_I2C_ADDR; return false; } =20 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_target_addr, index, data); } =20 @@ -144,7 +144,7 @@ static int tmds_register_read(int index) u8 data; =20 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_target_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_target_addr, (u8) index, buff, buff_len); return 0; } @@ -256,14 +256,14 @@ static int viafb_dvi_query_EDID(void) =20 DEBUG_MSG(KERN_INFO "viafb_dvi_query_EDID!!\n"); =20 - restore =3D viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr; - viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr =3D 0xA0; + restore =3D viaparinfo->chip_info->tmds_chip_info.tmds_chip_target_addr; + viaparinfo->chip_info->tmds_chip_info.tmds_chip_target_addr =3D 0xA0; =20 data0 =3D (u8) tmds_register_read(0x00); data1 =3D (u8) tmds_register_read(0x01); if ((data0 =3D=3D 0) && (data1 =3D=3D 0xFF)) { viaparinfo->chip_info-> - tmds_chip_info.tmds_chip_slave_addr =3D restore; + tmds_chip_info.tmds_chip_target_addr =3D restore; return EDID_VERSION_1; /* Found EDID1 Table */ } =20 @@ -280,8 +280,8 @@ static void dvi_get_panel_size_from_DDCv1( =20 DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv1 \n"); =20 - restore =3D tmds_chip->tmds_chip_slave_addr; - tmds_chip->tmds_chip_slave_addr =3D 0xA0; + restore =3D tmds_chip->tmds_chip_target_addr; + tmds_chip->tmds_chip_target_addr =3D 0xA0; for (i =3D 0x25; i < 0x6D; i++) { switch (i) { case 0x36: @@ -306,7 +306,7 @@ static void dvi_get_panel_size_from_DDCv1( =20 DEBUG_MSG(KERN_INFO "DVI max pixelclock =3D %d\n", tmds_setting->max_pixel_clock); - tmds_chip->tmds_chip_slave_addr =3D restore; + tmds_chip->tmds_chip_target_addr =3D restore; } =20 /* 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_target_addr, 0x08, data); } } diff --git a/drivers/video/fbdev/via/lcd.c b/drivers/video/fbdev/via/lcd.c index beec5c8d4d08..8673fced8749 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 =3D VT1631_LVDS; - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =3D + viaparinfo->chip_info->lvds_chip_info.lvds_chip_target_addr =3D VT1631_LVDS_I2C_ADDR; =20 if (check_lvds_chip(VT1631_DEVICE_ID_REG, VT1631_DEVICE_ID)) { @@ -161,7 +161,7 @@ bool viafb_lvds_trasmitter_identify(void) =20 viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =3D NON_LVDS_TRANSMITTER; - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =3D + viaparinfo->chip_info->lvds_chip_info.lvds_chip_target_addr =3D VT1631_LVDS_I2C_ADDR; return false; } @@ -327,7 +327,7 @@ static int lvds_register_read(int index) u8 data; =20 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_target_addr, (u8) index, &data); return data; } diff --git a/drivers/video/fbdev/via/via_aux.h b/drivers/video/fbdev/via/vi= a_aux.h index 0933bbf20e58..464723fd514c 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 */ =20 struct via_aux_bus *bus; /* the I2C bus used */ - u8 addr; /* the I2C slave address */ + u8 addr; /* the I2C target address */ =20 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/vi= a_i2c.c index 582502810575..5edd3827ca27 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); } =20 -int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata) +int viafb_i2c_readbyte(u8 adap, u8 target_addr, u8 index, u8 *pdata) { int ret; u8 mm1[] =3D {0x00}; @@ -115,7 +115,7 @@ int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index= , u8 *pdata) *pdata =3D 0; msgs[0].flags =3D 0; msgs[1].flags =3D I2C_M_RD; - msgs[0].addr =3D msgs[1].addr =3D slave_addr / 2; + msgs[0].addr =3D msgs[1].addr =3D target_addr / 2; mm1[0] =3D index; msgs[0].len =3D 1; msgs[1].len =3D 1; msgs[0].buf =3D mm1; msgs[1].buf =3D pdata; @@ -128,7 +128,7 @@ int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index= , u8 *pdata) return ret; } =20 -int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data) +int viafb_i2c_writebyte(u8 adap, u8 target_addr, u8 index, u8 data) { int ret; u8 msg[2] =3D { index, data }; @@ -137,7 +137,7 @@ int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 inde= x, u8 data) if (!via_i2c_par[adap].is_active) return -ENODEV; msgs.flags =3D 0; - msgs.addr =3D slave_addr / 2; + msgs.addr =3D target_addr / 2; msgs.len =3D 2; msgs.buf =3D msg; ret =3D i2c_transfer(&via_i2c_par[adap].adapter, &msgs, 1); @@ -149,7 +149,7 @@ int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 inde= x, u8 data) return ret; } =20 -int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int bu= ff_len) +int viafb_i2c_readbytes(u8 adap, u8 target_addr, u8 index, u8 *buff, int b= uff_len) { int ret; u8 mm1[] =3D {0x00}; @@ -159,7 +159,7 @@ int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 inde= x, u8 *buff, int buff_len return -ENODEV; msgs[0].flags =3D 0; msgs[1].flags =3D I2C_M_RD; - msgs[0].addr =3D msgs[1].addr =3D slave_addr / 2; + msgs[0].addr =3D msgs[1].addr =3D target_addr / 2; mm1[0] =3D index; msgs[0].len =3D 1; msgs[1].len =3D buff_len; msgs[0].buf =3D mm1; msgs[1].buf =3D buff; diff --git a/drivers/video/fbdev/via/vt1636.c b/drivers/video/fbdev/via/vt1= 636.c index 8d8cfdb05618..0d58ca144e19 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_informati= on u8 data; =20 viafb_i2c_readbyte(plvds_chip_info->i2c_port, - plvds_chip_info->lvds_chip_slave_addr, index, &data); + plvds_chip_info->lvds_chip_target_addr, index, &data); return data; } =20 @@ -60,7 +60,7 @@ void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_i= nformation data =3D (data & (~io_data.Mask)) | io_data.Data; =20 viafb_i2c_writebyte(plvds_chip_info->i2c_port, - plvds_chip_info->lvds_chip_slave_addr, index, data); + plvds_chip_info->lvds_chip_target_addr, index, data); } =20 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"); =20 /* Sense VT1636 LVDS Transmiter */ - viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =3D + viaparinfo->chip_info->lvds_chip_info.lvds_chip_target_addr =3D VT1636_LVDS_I2C_ADDR; =20 /* Check vendor ID first: */ --=20 2.34.1